| Index: Source/core/rendering/RenderWidget.h
|
| diff --git a/Source/core/rendering/RenderWidget.h b/Source/core/rendering/RenderWidget.h
|
| index 2cde8486906f0fb1c8d992f2c812c6d7543fc35b..1574f6686d078e2d4936a38f7e97b7c2a3b97ff7 100644
|
| --- a/Source/core/rendering/RenderWidget.h
|
| +++ b/Source/core/rendering/RenderWidget.h
|
| @@ -31,9 +31,9 @@ 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();
|
|
|
| @@ -42,17 +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:
|
| explicit RenderWidget(Element*);
|
|
|
| - void clearWidget();
|
| -
|
| virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE FINAL;
|
| virtual void layout();
|
| virtual void paint(PaintInfo&, const LayoutPoint&);
|
| @@ -62,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;
|
|
|