Remove concept of child Widgets.

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
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #ifndef FrameView_h
 #define FrameView_h
 
 #include "core/rendering/PaintPhase.h"
-#include "platform/FrameWidget.h"
 #include "platform/HostWindow.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/Widget.h"
-#include "platform/Widget.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/Color.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "wtf/Forward.h"
 #include "wtf/HashSet.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class DocumentLifecycle;
 class Cursor;
 class Element;
 class FloatSize;
 class LocalFrame;
 class KURL;
 class Node;
 class Page;
 class RenderBox;
 class RenderObject;
 class RenderStyle;
 class RenderView;
 
 typedef unsigned long long DOMTimeStamp;
 
-class FrameView final : public FrameWidget {
+class FrameView final : public Widget {
 public:
     friend class RenderView;
 
     static PassRefPtr<FrameView> create(LocalFrame*);
     static PassRefPtr<FrameView> create(LocalFrame*, const IntSize& initialSize);
 
     virtual ~FrameView();
 
     HostWindow* hostWindow() const;
 
@@ skipping 127 matching lines @@
     const ScrollableAreaSet* scrollableAreas() const { return m_scrollableAreas.get(); }
 
     // With CSS style "resize:" enabled, a little resizer handle will appear at the bottom
     // right of the object. We keep track of these resizer areas for checking if touches
     // (implemented using Scroll gesture) are targeting the resizer.
     typedef HashSet<RenderBox*> ResizerAreaSet;
     void addResizerArea(RenderBox&);
     void removeResizerArea(RenderBox&);
     const ResizerAreaSet* resizerAreas() const { return m_resizerAreas.get(); }
 
-    void addChild(PassRefPtr<Widget>);
-    void removeChild(Widget*) final;
-
     // This function exists for ports that need to handle wheel events manually.
     // On Mac WebKit1 the underlying NSScrollView just does the scrolling, but on most other platforms
     // we need this function in order to do the scroll ourselves.
     bool wheelEvent(const PlatformWheelEvent&);
 
     bool inProgrammaticScroll() const { return m_inProgrammaticScroll; }
     void setInProgrammaticScroll(bool programmaticScroll) { m_inProgrammaticScroll = programmaticScroll; }
 
     void setHasSoftwareFilters(bool hasSoftwareFilters) { m_hasSoftwareFilters = hasSoftwareFilters; }
     bool hasSoftwareFilters() const { return m_hasSoftwareFilters; }
@@ skipping 51 matching lines @@
 
     bool isVerticalDocument() const;
     bool isFlippedDocument() const;
 
 private:
     explicit FrameView(LocalFrame*);
 
     void reset();
     void init();
 
-    virtual void frameRectsChanged() override;
     virtual bool isFrameView() const override { return true; }
 
     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);
@@ skipping 32 matching lines @@
     {
         return !isInPerformLayout() || canInvalidatePaintDuringPerformLayout();
     }
 
     static double s_currentFrameTimeStamp; // used for detecting decoded resource thrash in the cache
     static bool s_inPaintContents;
 
     LayoutSize m_size;
 
     RefPtr<LocalFrame> m_frame;
-    HashSet<RefPtr<Widget> > m_children;
 
     bool m_doFullPaintInvalidation;
 
     // FIXME(sky): Remove
     bool m_canHaveScrollbars;
 
     bool m_hasPendingLayout;
     RenderObject* m_layoutSubtreeRoot;
 
     bool m_layoutSchedulingEnabled;
@@ skipping 69 matching lines @@
         m_view->setCanInvalidatePaintDuringPerformLayout(m_originalValue);
     }
 private:
     FrameView* m_view;
     bool m_originalValue;
 };
 
 } // namespace blink
 
 #endif // FrameView_h