| Index: sky/engine/core/frame/FrameView.h
|
| diff --git a/sky/engine/core/frame/FrameView.h b/sky/engine/core/frame/FrameView.h
|
| index 501026f2d07d2581a7d4febfc442a7f0ffd8df5e..8fcd4fb124af1270af3a50d4cc1158f84ab4a9ed 100644
|
| --- a/sky/engine/core/frame/FrameView.h
|
| +++ b/sky/engine/core/frame/FrameView.h
|
| @@ -28,10 +28,11 @@
|
| #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"
|
| @@ -155,11 +156,6 @@ public:
|
| // 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; }
|
|
|
| @@ -248,8 +244,6 @@ private:
|
| RefPtr<Node> m_nodeToDraw;
|
| bool m_isPainting;
|
|
|
| - OwnPtr<ScrollableAreaSet> m_scrollableAreas;
|
| -
|
| bool m_hasSoftwareFilters;
|
|
|
| float m_visibleContentScaleFactor;
|
|
|