Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderWidget.h b/src/third_party/WebKit/Source/core/rendering/RenderWidget.h
index 51c2ecf..bef87cb 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderWidget.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderWidget.h
@@ -25,34 +25,28 @@
 #include "core/rendering/RenderReplaced.h"
 #include "platform/Widget.h"
 
-namespace WebCore {
+namespace blink {
 
 class RenderWidget : public RenderReplaced {
 public:
     virtual ~RenderWidget();
 
-    Widget* widget() const { return m_widget.get(); }
-    virtual void setWidget(PassRefPtr<Widget>);
+    Widget* widget() const;
 
+    void updateOnWidgetChange();
     void updateWidgetPosition();
     void widgetPositionsUpdated();
 
-    void setIsOverlapped(bool);
-
+#if !ENABLE(OILPAN)
     void ref() { ++m_refCount; }
     void deref();
-
-    class UpdateSuspendScope {
-    public:
-        UpdateSuspendScope();
-        ~UpdateSuspendScope();
-    };
+#endif
+    virtual bool isWidget() const OVERRIDE FINAL { return true; }
+    bool updateWidgetGeometry();
 
 protected:
     explicit RenderWidget(Element*);
 
-    void clearWidget();
-
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE FINAL;
     virtual void layout() OVERRIDE;
     virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
@@ -62,20 +56,17 @@ protected:
     virtual void paintContents(PaintInfo&, const LayoutPoint&);
 
 private:
-    virtual bool isWidget() const OVERRIDE FINAL { return true; }
-
     virtual void willBeDestroyed() OVERRIDE FINAL;
     virtual void destroy() OVERRIDE FINAL;
 
     bool setWidgetGeometry(const LayoutRect&);
-    bool updateWidgetGeometry();
-
-    RefPtr<Widget> m_widget;
+#if !ENABLE(OILPAN)
     int m_refCount;
+#endif
 };
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderWidget, isWidget());
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // RenderWidget_h