Index: Source/core/rendering/RenderWidget.h |
diff --git a/Source/core/rendering/RenderWidget.h b/Source/core/rendering/RenderWidget.h |
index b9ed0f9c4aae2eb13369dd1abe95c9de90ff9278..ca93641fec5c65045e071ddb5733e80c83616c90 100644 |
--- a/Source/core/rendering/RenderWidget.h |
+++ b/Source/core/rendering/RenderWidget.h |
@@ -31,8 +31,7 @@ class RenderWidget : public RenderReplaced { |
public: |
virtual ~RenderWidget(); |
- Widget* widget() const { return m_widget.get(); } |
- virtual void setWidget(PassRefPtr<Widget>); |
+ Widget* widget() const; |
void updateWidgetPosition(); |
void widgetPositionsUpdated(); |
@@ -43,19 +42,14 @@ public: |
void ref() { ++m_refCount; } |
void deref(); |
- class UpdateSuspendScope { |
- public: |
- UpdateSuspendScope(); |
- ~UpdateSuspendScope(); |
- }; |
+ FrameView* frameView() const { return m_frameView; } |
+ |
+ virtual bool isWidget() const OVERRIDE FINAL { return true; } |
+ bool updateWidgetGeometry(); |
protected: |
RenderWidget(Element*); |
- FrameView* frameView() const { return m_frameView; } |
- |
- void clearWidget(); |
- |
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE FINAL; |
virtual void layout(); |
virtual void paint(PaintInfo&, const LayoutPoint&); |
@@ -65,15 +59,11 @@ 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; |
FrameView* m_frameView; |
IntRect m_clipRect; // The rectangle needs to remain correct after scrolling, so it is stored in content view coordinates, and not clipped to window. |
int m_refCount; |