| Index: sky/engine/core/frame/FrameView.h
|
| diff --git a/sky/engine/core/frame/FrameView.h b/sky/engine/core/frame/FrameView.h
|
| index 5bff1a44f301657d6536b4c4f4096350c3e876b2..6cef375c85304d992cdcff57142aee25fe00501c 100644
|
| --- a/sky/engine/core/frame/FrameView.h
|
| +++ b/sky/engine/core/frame/FrameView.h
|
| @@ -53,7 +53,6 @@ class RenderBox;
|
| class RenderObject;
|
| class RenderStyle;
|
| class RenderView;
|
| -class RenderWidget;
|
|
|
| typedef unsigned long long DOMTimeStamp;
|
|
|
| @@ -95,8 +94,6 @@ public:
|
| bool needsLayout() const;
|
| void setNeedsLayout();
|
|
|
| - void setNeedsUpdateWidgetPositions() { m_needsUpdateWidgetPositions = true; }
|
| -
|
| // Methods for getting/setting the size Blink should use to layout the contents.
|
| IntSize layoutSize(IncludeScrollbarsInRect = ExcludeScrollbars) const;
|
| void setLayoutSize(const IntSize&);
|
| @@ -148,10 +145,6 @@ public:
|
| bool wasScrolledByUser() const;
|
| void setWasScrolledByUser(bool);
|
|
|
| - void addWidget(RenderWidget*);
|
| - void removeWidget(RenderWidget*);
|
| - void updateWidgetPositions();
|
| -
|
| void paintContents(GraphicsContext*, const IntRect& damageRect);
|
| void setPaintBehavior(PaintBehavior);
|
| PaintBehavior paintBehavior() const;
|
| @@ -288,8 +281,6 @@ private:
|
| virtual void frameRectsChanged() override;
|
| virtual bool isFrameView() const override { return true; }
|
|
|
| - friend class RenderWidget;
|
| -
|
| bool contentsInCompositedLayer() const;
|
|
|
| void applyOverflowToViewportAndSetRenderer(RenderObject*, ScrollbarMode& hMode, ScrollbarMode& vMode);
|
| @@ -319,8 +310,6 @@ private:
|
| virtual IntPoint convertToContainingView(const IntPoint&) const override;
|
| virtual IntPoint convertFromContainingView(const IntPoint&) const override;
|
|
|
| - void updateWidgetPositionsIfNeeded();
|
| -
|
| bool wasViewportResized();
|
| void sendResizeEventIfNeeded();
|
|
|
| @@ -341,9 +330,6 @@ private:
|
|
|
| LayoutSize m_size;
|
|
|
| - // FIXME: These are just "children" of the FrameView and should be RefPtr<Widget> instead.
|
| - HashSet<RefPtr<RenderWidget> > m_widgets;
|
| -
|
| RefPtr<LocalFrame> m_frame;
|
| HashSet<RefPtr<Widget> > m_children;
|
|
|
| @@ -404,8 +390,6 @@ private:
|
| Timer<FrameView> m_didScrollTimer;
|
|
|
| Vector<IntRect> m_tickmarks;
|
| -
|
| - bool m_needsUpdateWidgetPositions;
|
| };
|
|
|
| DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFrameView());
|
|
|