Upstream version 9.38.198.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 a33e283..06506ab 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderEmbeddedObject.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderEmbeddedObject.h
@@ -25,7 +25,7 @@
 
 #include "core/rendering/RenderPart.h"
 
-namespace WebCore {
+namespace blink {
 
 class TextRun;
 
@@ -43,28 +43,24 @@ public:
     void setPluginUnavailabilityReason(PluginUnavailabilityReason);
     bool showsUnavailablePluginIndicator() const;
 
-protected:
+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;
 
-protected:
     virtual void layout() OVERRIDE FINAL;
 
-private:
     virtual const char* renderName() const OVERRIDE { return "RenderEmbeddedObject"; }
     virtual bool isEmbeddedObject() const OVERRIDE FINAL { return true; }
     virtual RenderBox* embeddedContentBox() const OVERRIDE FINAL;
 
-    void paintSnapshotImage(PaintInfo&, const LayoutPoint&, Image*);
-    virtual void paintContents(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
-
     virtual LayerType layerTypeRequired() const 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(CompositingTriggerFlags) const OVERRIDE;
+    virtual CompositingReasons additionalCompositingReasons() const OVERRIDE;
 
     bool m_showsUnavailablePluginIndicator;
     PluginUnavailabilityReason m_pluginUnavailabilityReason;
@@ -73,6 +69,6 @@ private:
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderEmbeddedObject, isEmbeddedObject());
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // RenderEmbeddedObject_h