| Index: Source/core/page/scrolling/ScrollingCoordinator.h
|
| diff --git a/Source/core/page/scrolling/ScrollingCoordinator.h b/Source/core/page/scrolling/ScrollingCoordinator.h
|
| index cf224af7fff7f3ccdfb5b97a959b547ec1585c85..55586803ca11a42d263416de3a0d88a8b854a28f 100644
|
| --- a/Source/core/page/scrolling/ScrollingCoordinator.h
|
| +++ b/Source/core/page/scrolling/ScrollingCoordinator.h
|
| @@ -95,7 +95,7 @@ public:
|
| MainThreadScrollingReasons mainThreadScrollingReasons() const;
|
| bool shouldUpdateScrollLayerPositionOnMainThread() const { return mainThreadScrollingReasons() != 0; }
|
|
|
| - PassOwnPtr<blink::WebScrollbarLayer> createSolidColorScrollbarLayer(ScrollbarOrientation, int thumbThickness, int trackStart, bool isLeftSideVerticalScrollbar);
|
| + PassOwnPtr<WebScrollbarLayer> createSolidColorScrollbarLayer(ScrollbarOrientation, int thumbThickness, int trackStart, bool isLeftSideVerticalScrollbar);
|
|
|
| void willDestroyScrollableArea(ScrollableArea*);
|
| // Returns true if the coordinator handled this change.
|
| @@ -144,13 +144,13 @@ private:
|
| void setTouchEventTargetRects(LayerHitTestRects&);
|
| void computeTouchEventTargetRects(LayerHitTestRects&);
|
|
|
| - blink::WebScrollbarLayer* addWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation, PassOwnPtr<blink::WebScrollbarLayer>);
|
| - blink::WebScrollbarLayer* getWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation);
|
| + WebScrollbarLayer* addWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation, PassOwnPtr<WebScrollbarLayer>);
|
| + WebScrollbarLayer* getWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation);
|
| void removeWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation);
|
|
|
| bool frameViewIsDirty() const;
|
|
|
| - using ScrollbarMap = HashMap<ScrollableArea*, OwnPtr<blink::WebScrollbarLayer>>;
|
| + using ScrollbarMap = HashMap<ScrollableArea*, OwnPtr<WebScrollbarLayer>>;
|
| ScrollbarMap m_horizontalScrollbars;
|
| ScrollbarMap m_verticalScrollbars;
|
| HashSet<const DeprecatedPaintLayer*> m_layersWithTouchRects;
|
|
|