Index: Source/core/page/scrolling/ScrollingCoordinator.cpp |
diff --git a/Source/core/page/scrolling/ScrollingCoordinator.cpp b/Source/core/page/scrolling/ScrollingCoordinator.cpp |
index ca72786a164baa198caa2f41b0cb17abaa85f6d6..1905e88b6fa879564e33c7f06b9f5f89072514f2 100644 |
--- a/Source/core/page/scrolling/ScrollingCoordinator.cpp |
+++ b/Source/core/page/scrolling/ScrollingCoordinator.cpp |
@@ -61,11 +61,11 @@ |
#include "public/platform/WebScrollbarThemePainter.h" |
#include "wtf/text/StringBuilder.h" |
-using WebKit::WebLayer; |
-using WebKit::WebLayerPositionConstraint; |
-using WebKit::WebRect; |
-using WebKit::WebScrollbarLayer; |
-using WebKit::WebVector; |
+using blink::WebLayer; |
+using blink::WebLayerPositionConstraint; |
+using blink::WebRect; |
+using blink::WebScrollbarLayer; |
+using blink::WebVector; |
namespace WebCore { |
@@ -219,18 +219,18 @@ void ScrollingCoordinator::removeWebScrollbarLayer(ScrollableArea* scrollableAre |
static PassOwnPtr<WebScrollbarLayer> createScrollbarLayer(Scrollbar* scrollbar) |
{ |
ScrollbarTheme* theme = scrollbar->theme(); |
- WebKit::WebScrollbarThemePainter painter(theme, scrollbar); |
- OwnPtr<WebKit::WebScrollbarThemeGeometry> geometry(WebKit::WebScrollbarThemeGeometryNative::create(theme)); |
+ blink::WebScrollbarThemePainter painter(theme, scrollbar); |
+ OwnPtr<blink::WebScrollbarThemeGeometry> geometry(blink::WebScrollbarThemeGeometryNative::create(theme)); |
- OwnPtr<WebScrollbarLayer> scrollbarLayer = adoptPtr(WebKit::Platform::current()->compositorSupport()->createScrollbarLayer(new WebKit::WebScrollbarImpl(scrollbar), painter, geometry.leakPtr())); |
+ OwnPtr<WebScrollbarLayer> scrollbarLayer = adoptPtr(blink::Platform::current()->compositorSupport()->createScrollbarLayer(new blink::WebScrollbarImpl(scrollbar), painter, geometry.leakPtr())); |
GraphicsLayer::registerContentsLayer(scrollbarLayer->layer()); |
return scrollbarLayer.release(); |
} |
PassOwnPtr<WebScrollbarLayer> ScrollingCoordinator::createSolidColorScrollbarLayer(ScrollbarOrientation orientation, int thumbThickness, bool isLeftSideVerticalScrollbar) |
{ |
- WebKit::WebScrollbar::Orientation webOrientation = (orientation == HorizontalScrollbar) ? WebKit::WebScrollbar::Horizontal : WebKit::WebScrollbar::Vertical; |
- OwnPtr<WebScrollbarLayer> scrollbarLayer = adoptPtr(WebKit::Platform::current()->compositorSupport()->createSolidColorScrollbarLayer(webOrientation, thumbThickness, isLeftSideVerticalScrollbar)); |
+ blink::WebScrollbar::Orientation webOrientation = (orientation == HorizontalScrollbar) ? blink::WebScrollbar::Horizontal : blink::WebScrollbar::Vertical; |
+ OwnPtr<WebScrollbarLayer> scrollbarLayer = adoptPtr(blink::Platform::current()->compositorSupport()->createSolidColorScrollbarLayer(webOrientation, thumbThickness, isLeftSideVerticalScrollbar)); |
GraphicsLayer::registerContentsLayer(scrollbarLayer->layer()); |
return scrollbarLayer.release(); |
} |
@@ -257,7 +257,7 @@ static void setupScrollbarLayer(GraphicsLayer* scrollbarGraphicsLayer, WebScroll |
scrollbarGraphicsLayer->setDrawsContent(false); |
} |
-WebScrollbarLayer* ScrollingCoordinator::addWebScrollbarLayer(ScrollableArea* scrollableArea, ScrollbarOrientation orientation, PassOwnPtr<WebKit::WebScrollbarLayer> scrollbarLayer) |
+WebScrollbarLayer* ScrollingCoordinator::addWebScrollbarLayer(ScrollableArea* scrollableArea, ScrollbarOrientation orientation, PassOwnPtr<blink::WebScrollbarLayer> scrollbarLayer) |
{ |
ScrollbarMap& scrollbars = orientation == HorizontalScrollbar ? m_horizontalScrollbars : m_verticalScrollbars; |
return scrollbars.add(scrollableArea, scrollbarLayer).iterator->value.get(); |