Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderEmbeddedObject.h

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderEmbeddedObject.h b/src/third_party/WebKit/Source/core/rendering/RenderEmbeddedObject.h
index 06506ab..2860d7a 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderEmbeddedObject.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderEmbeddedObject.h
@@ -44,23 +44,23 @@ public:
     bool showsUnavailablePluginIndicator() const;
 
 private:
-    virtual void paintContents(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
-    virtual void paintReplaced(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
-    virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
+    virtual void paintContents(PaintInfo&, const LayoutPoint&) override final;
+    virtual void paintReplaced(PaintInfo&, const LayoutPoint&) override final;
+    virtual void paint(PaintInfo&, const LayoutPoint&) override final;
 
-    virtual void layout() OVERRIDE FINAL;
+    virtual void layout() override final;
 
-    virtual const char* renderName() const OVERRIDE { return "RenderEmbeddedObject"; }
-    virtual bool isEmbeddedObject() const OVERRIDE FINAL { return true; }
-    virtual RenderBox* embeddedContentBox() const OVERRIDE FINAL;
+    virtual const char* renderName() const override { return "RenderEmbeddedObject"; }
+    virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectEmbeddedObject || RenderPart::isOfType(type); }
+    virtual RenderBox* embeddedContentBox() const override final;
 
-    virtual LayerType layerTypeRequired() const OVERRIDE FINAL;
+    virtual LayerType layerTypeRequired() const override final;
 
-    virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier) OVERRIDE FINAL;
+    virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier) override final;
 
     bool getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatRect& contentRect, Path&, FloatRect& replacementTextRect, Font&, TextRun&, float& textWidth) const;
 
-    virtual CompositingReasons additionalCompositingReasons() const OVERRIDE;
+    virtual CompositingReasons additionalCompositingReasons() const override;
 
     bool m_showsUnavailablePluginIndicator;
     PluginUnavailabilityReason m_pluginUnavailabilityReason;