Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / frame / PinchViewport.cpp

diff --git a/src/third_party/WebKit/Source/core/frame/PinchViewport.cpp b/src/third_party/WebKit/Source/core/frame/PinchViewport.cpp
index 09947a9..0683ed0 100644 (file)
--- a/src/third_party/WebKit/Source/core/frame/PinchViewport.cpp
+++ b/src/third_party/WebKit/Source/core/frame/PinchViewport.cpp
@@ -57,11 +57,11 @@ using blink::WebLayer;
 using blink::WebLayerTreeView;
 using blink::WebScrollbar;
 using blink::WebScrollbarLayer;
-using WebCore::FrameHost;
-using WebCore::GraphicsLayer;
-using WebCore::GraphicsLayerFactory;
+using blink::FrameHost;
+using blink::GraphicsLayer;
+using blink::GraphicsLayerFactory;
 
-namespace WebCore {
+namespace blink {
 
 PinchViewport::PinchViewport(FrameHost& owner)
     : m_frameHost(owner)
@@ -77,7 +77,7 @@ void PinchViewport::setSize(const IntSize& size)
     if (m_size == size)
         return;
 
-    TRACE_EVENT2("webkit", "PinchViewport::setSize", "width", size.width(), "height", size.height());
+    TRACE_EVENT2("blink", "PinchViewport::setSize", "width", size.width(), "height", size.height());
     m_size = size;
 
     // Make sure we clamp the offset to within the new bounds.
@@ -100,7 +100,7 @@ void PinchViewport::reset()
 
 void PinchViewport::mainFrameDidChangeSize()
 {
-    TRACE_EVENT0("webkit", "PinchViewport::mainFrameDidChangeSize");
+    TRACE_EVENT0("blink", "PinchViewport::mainFrameDidChangeSize");
 
     // In unit tests we may not have initialized the layer tree.
     if (m_innerViewportScrollLayer)
@@ -211,7 +211,7 @@ void PinchViewport::setScale(float scale)
 //
 void PinchViewport::attachToLayerTree(GraphicsLayer* currentLayerTreeRoot, GraphicsLayerFactory* graphicsLayerFactory)
 {
-    TRACE_EVENT1("webkit", "PinchViewport::attachToLayerTree", "currentLayerTreeRoot", (bool)currentLayerTreeRoot);
+    TRACE_EVENT1("blink", "PinchViewport::attachToLayerTree", "currentLayerTreeRoot", (bool)currentLayerTreeRoot);
     if (!currentLayerTreeRoot) {
         m_innerViewportScrollLayer->removeAllChildren();
         return;
@@ -234,7 +234,7 @@ void PinchViewport::attachToLayerTree(GraphicsLayer* currentLayerTreeRoot, Graph
         m_overlayScrollbarHorizontal = GraphicsLayer::create(graphicsLayerFactory, this);
         m_overlayScrollbarVertical = GraphicsLayer::create(graphicsLayerFactory, this);
 
-        WebCore::ScrollingCoordinator* coordinator = m_frameHost.page().scrollingCoordinator();
+        blink::ScrollingCoordinator* coordinator = m_frameHost.page().scrollingCoordinator();
         ASSERT(coordinator);
         coordinator->setLayerIsContainerForFixedPositionLayers(m_innerViewportScrollLayer.get(), true);
 
@@ -310,7 +310,7 @@ void PinchViewport::setupScrollbar(WebScrollbar::Orientation orientation)
 
 void PinchViewport::registerLayersWithTreeView(WebLayerTreeView* layerTreeView) const
 {
-    TRACE_EVENT0("webkit", "PinchViewport::registerLayersWithTreeView");
+    TRACE_EVENT0("blink", "PinchViewport::registerLayersWithTreeView");
     ASSERT(layerTreeView);
     ASSERT(m_frameHost.page().mainFrame());
     ASSERT(m_frameHost.page().mainFrame()->isLocalFrame());
@@ -450,4 +450,4 @@ String PinchViewport::debugName(const GraphicsLayer* graphicsLayer)
     return name;
 }
 
-} // namespace WebCore
+} // namespace blink