Index: Source/core/page/scrolling/ScrollingCoordinator.h |
diff --git a/Source/core/page/scrolling/ScrollingCoordinator.h b/Source/core/page/scrolling/ScrollingCoordinator.h |
index 0c429131bbf7de6649822da248299a3bb15811e1..e0bebd9aa104c9a26473d836632e903738b90b73 100644 |
--- a/Source/core/page/scrolling/ScrollingCoordinator.h |
+++ b/Source/core/page/scrolling/ScrollingCoordinator.h |
@@ -32,7 +32,7 @@ |
#include "platform/scroll/ScrollTypes.h" |
#include "wtf/text/WTFString.h" |
-namespace WebKit { |
+namespace blink { |
class WebLayer; |
class WebScrollbarLayer; |
} |
@@ -95,7 +95,7 @@ public: |
MainThreadScrollingReasons mainThreadScrollingReasons() const; |
bool shouldUpdateScrollLayerPositionOnMainThread() const { return mainThreadScrollingReasons() != 0; } |
- PassOwnPtr<WebKit::WebScrollbarLayer> createSolidColorScrollbarLayer(ScrollbarOrientation, int thumbThickness, bool isLeftSideVerticalScrollbar); |
+ PassOwnPtr<blink::WebScrollbarLayer> createSolidColorScrollbarLayer(ScrollbarOrientation, int thumbThickness, bool isLeftSideVerticalScrollbar); |
void willDestroyScrollableArea(ScrollableArea*); |
// Returns true if the coordinator handled this change. |
@@ -140,7 +140,7 @@ private: |
bool hasVisibleSlowRepaintViewportConstrainedObjects(FrameView*) const; |
void updateShouldUpdateScrollLayerPositionOnMainThread(); |
- static WebKit::WebLayer* scrollingWebLayerForScrollableArea(ScrollableArea*); |
+ static blink::WebLayer* scrollingWebLayerForScrollableArea(ScrollableArea*); |
bool touchHitTestingEnabled() const; |
void setShouldHandleScrollGestureOnMainThreadRegion(const Region&); |
@@ -148,12 +148,12 @@ private: |
void computeTouchEventTargetRects(LayerHitTestRects&); |
void setWheelEventHandlerCount(unsigned); |
- WebKit::WebScrollbarLayer* addWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation, PassOwnPtr<WebKit::WebScrollbarLayer>); |
- WebKit::WebScrollbarLayer* getWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation); |
+ blink::WebScrollbarLayer* addWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation, PassOwnPtr<blink::WebScrollbarLayer>); |
+ blink::WebScrollbarLayer* getWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation); |
void removeWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation); |
- typedef HashMap<ScrollableArea*, OwnPtr<WebKit::WebScrollbarLayer> > ScrollbarMap; |
+ typedef HashMap<ScrollableArea*, OwnPtr<blink::WebScrollbarLayer> > ScrollbarMap; |
ScrollbarMap m_horizontalScrollbars; |
ScrollbarMap m_verticalScrollbars; |
HashSet<const RenderLayer*> m_layersWithTouchRects; |