Remove ScrollableArea and Scrollbar

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 10 matching lines @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #ifndef SKY_ENGINE_CORE_FRAME_FRAMEVIEW_H_
 #define SKY_ENGINE_CORE_FRAME_FRAMEVIEW_H_
 
 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
 #include "sky/engine/core/rendering/PaintPhase.h"
 #include "sky/engine/platform/HostWindow.h"
+#include "sky/engine/platform/Timer.h"
 #include "sky/engine/platform/Widget.h"
 #include "sky/engine/platform/geometry/LayoutRect.h"
 #include "sky/engine/platform/graphics/Color.h"
-#include "sky/engine/platform/scroll/ScrollableArea.h"
+#include "sky/engine/platform/scroll/ScrollTypes.h"
 #include "sky/engine/wtf/Forward.h"
 #include "sky/engine/wtf/HashSet.h"
 #include "sky/engine/wtf/OwnPtr.h"
 #include "sky/engine/wtf/text/WTFString.h"
 
 namespace blink {
 
 class DocumentLifecycle;
 class Cursor;
 class Element;
@@ skipping 103 matching lines @@
     IntPoint convertFromRenderer(const RenderObject&, const IntPoint&) const;
     IntPoint convertToRenderer(const RenderObject&, const IntPoint&) const;
 
     bool shouldSetCursor() const;
 
     void setCursor(const Cursor&);
 
     // FIXME: Remove this method once plugin loading is decoupled from layout.
     void flushAnyPendingPostLayoutTasks();
 
-    typedef HashSet<ScrollableArea*> ScrollableAreaSet;
-    void addScrollableArea(ScrollableArea*);
-    void removeScrollableArea(ScrollableArea*);
-    const ScrollableAreaSet* scrollableAreas() const { return m_scrollableAreas.get(); }
-
     void setHasSoftwareFilters(bool hasSoftwareFilters) { m_hasSoftwareFilters = hasSoftwareFilters; }
     bool hasSoftwareFilters() const { return m_hasSoftwareFilters; }
 
     bool isActive() const;
 
     // FIXME: This should probably be renamed as the 'inSubtreeLayout' parameter
     // passed around the FrameView layout methods can be true while this returns
     // false.
     bool isSubtreeLayout() const { return !!m_layoutSubtreeRoot; }
 
@@ skipping 68 matching lines @@
     bool m_overflowStatusDirty;
     bool m_horizontalOverflow;
     bool m_verticalOverflow;
     RenderObject* m_viewportRenderer;
 
     double m_lastPaintTime;
 
     RefPtr<Node> m_nodeToDraw;
     bool m_isPainting;
 
-    OwnPtr<ScrollableAreaSet> m_scrollableAreas;
-
     bool m_hasSoftwareFilters;
 
     float m_visibleContentScaleFactor;
     IntSize m_inputEventsOffsetForEmulation;
     float m_inputEventsScaleFactorForEmulation;
 
     IntSize m_layoutSize;
     bool m_layoutSizeFixedToFrameSize;
 
     Vector<IntRect> m_tickmarks;
 };
 
 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFrameView());
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_CORE_FRAME_FRAMEVIEW_H_