Remove RenderWidget.

sky/engine/core/frame/FrameView.h

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ skipping 35 matching lines @@
 class Element;
 class FloatSize;
 class LocalFrame;
 class KURL;
 class Node;
 class Page;
 class RenderBox;
 class RenderObject;
 class RenderStyle;
 class RenderView;
-class RenderWidget;
 
 typedef unsigned long long DOMTimeStamp;
 
 class FrameView final : public FrameWidget {
 public:
     friend class RenderView;
 
     static PassRefPtr<FrameView> create(LocalFrame*);
     static PassRefPtr<FrameView> create(LocalFrame*, const IntSize& initialSize);
 
@@ skipping 21 matching lines @@
     void setCanInvalidatePaintDuringPerformLayout(bool b) { m_canInvalidatePaintDuringPerformLayout = b; }
     bool canInvalidatePaintDuringPerformLayout() const { return m_canInvalidatePaintDuringPerformLayout; }
 
     RenderObject* layoutRoot(bool onlyDuringLayout = false) const;
     void clearLayoutSubtreeRoot() { m_layoutSubtreeRoot = 0; }
     int layoutCount() const { return m_layoutCount; }
 
     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&);
 
     // If this is set to false, the layout size will need to be explicitly set by the owner.
     // E.g. WebViewImpl sets its mainFrame's layout size manually
     void setLayoutSizeFixedToFrameSize(bool isFixed) { m_layoutSizeFixedToFrameSize = isFixed; }
     bool layoutSizeFixedToFrameSize() { return m_layoutSizeFixedToFrameSize; }
 
     bool needsFullPaintInvalidation() const { return m_doFullPaintInvalidation; }
@@ skipping 31 matching lines @@
     AtomicString mediaType() const;
     void setMediaType(const AtomicString&);
 
     void restoreScrollbar();
 
     void postLayoutTimerFired(Timer<FrameView>*);
 
     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;
     bool isPainting() const;
     bool hasEverPainted() const { return m_lastPaintTime; }
     void setNodeToDraw(Node*);
 
     Color documentBackgroundColor() const;
 
     static double currentFrameTimeStamp() { return s_currentFrameTimeStamp; }
@@ skipping 116 matching lines @@
 
 private:
     explicit FrameView(LocalFrame*);
 
     void reset();
     void init();
 
     virtual void frameRectsChanged() override;
     virtual bool isFrameView() const override { return true; }
 
-    friend class RenderWidget;
-
     bool contentsInCompositedLayer() const;
 
     void applyOverflowToViewportAndSetRenderer(RenderObject*, ScrollbarMode& hMode, ScrollbarMode& vMode);
     void updateOverflowStatus(bool horizontalOverflow, bool verticalOverflow);
 
     void forceLayoutParentViewIfNeeded();
     void performPreLayoutTasks();
     void performLayout(RenderObject* rootForThisLayout, bool inSubtreeLayout);
     void scheduleOrPerformPostLayoutTasks();
     void performPostLayoutTasks();
 
     void invalidateTreeIfNeeded();
 
     void gatherDebugLayoutRects(RenderObject* layoutRoot);
 
     DocumentLifecycle& lifecycle() const;
 
     // FIXME(sky): Remove now that we're not a ScrollView?
     void contentRectangleForPaintInvalidation(const IntRect&);
     void contentsResized();
     void scrollbarExistenceDidChange();
 
     // Override ScrollView methods to do point conversion via renderers, in order to
     // take transforms into account.
     virtual IntRect convertToContainingView(const IntRect&) const override;
     virtual IntRect convertFromContainingView(const IntRect&) const override;
     virtual IntPoint convertToContainingView(const IntPoint&) const override;
     virtual IntPoint convertFromContainingView(const IntPoint&) const override;
 
-    void updateWidgetPositionsIfNeeded();
-
     bool wasViewportResized();
     void sendResizeEventIfNeeded();
 
     void scrollPositionChanged();
     void didScrollTimerFired(Timer<FrameView>*);
 
     void updateCompositedSelectionBoundsIfNeeded();
 
     void setLayoutSizeInternal(const IntSize&);
 
     bool paintInvalidationIsAllowed() const
     {
         return !isInPerformLayout() || canInvalidatePaintDuringPerformLayout();
     }
 
     static double s_currentFrameTimeStamp; // used for detecting decoded resource thrash in the cache
     static bool s_inPaintContents;
 
     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;
 
     bool m_doFullPaintInvalidation;
 
     // FIXME(sky): Remove
     bool m_canHaveScrollbars;
 
     bool m_hasPendingLayout;
     RenderObject* m_layoutSubtreeRoot;
@@ skipping 40 matching lines @@
     float m_visibleContentScaleFactor;
     IntSize m_inputEventsOffsetForEmulation;
     float m_inputEventsScaleFactorForEmulation;
 
     IntSize m_layoutSize;
     bool m_layoutSizeFixedToFrameSize;
 
     Timer<FrameView> m_didScrollTimer;
 
     Vector<IntRect> m_tickmarks;
-
-    bool m_needsUpdateWidgetPositions;
 };
 
 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFrameView());
 
 class AllowPaintInvalidationScope {
 public:
     explicit AllowPaintInvalidationScope(FrameView* view)
         : m_view(view)
         , m_originalValue(view ? view->canInvalidatePaintDuringPerformLayout() : false)
     {
@@ skipping 11 matching lines @@
         m_view->setCanInvalidatePaintDuringPerformLayout(m_originalValue);
     }
 private:
     FrameView* m_view;
     bool m_originalValue;
 };
 
 } // namespace blink
 
 #endif // FrameView_h