Index: content/renderer/gpu/render_widget_compositor.cc |
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc |
index bea8b07d386b5ab5c95626fd4ae3f2047ba846eb..82e75eea2a6eb604d3e8e2acc5c85ef0abf3cc65 100644 |
--- a/content/renderer/gpu/render_widget_compositor.cc |
+++ b/content/renderer/gpu/render_widget_compositor.cc |
@@ -39,9 +39,9 @@ namespace cc { |
class Layer; |
} |
-using WebKit::WebFloatPoint; |
-using WebKit::WebSize; |
-using WebKit::WebRect; |
+using blink::WebFloatPoint; |
+using blink::WebSize; |
+using blink::WebRect; |
namespace content { |
namespace { |
@@ -425,7 +425,7 @@ void RenderWidgetCompositor::setSurfaceReady() { |
layer_tree_host_->SetLayerTreeHostClientReady(); |
} |
-void RenderWidgetCompositor::setRootLayer(const WebKit::WebLayer& layer) { |
+void RenderWidgetCompositor::setRootLayer(const blink::WebLayer& layer) { |
layer_tree_host_->SetRootLayer( |
static_cast<const webkit::WebLayerImpl*>(&layer)->layer()); |
} |
@@ -461,7 +461,7 @@ float RenderWidgetCompositor::deviceScaleFactor() const { |
return layer_tree_host_->device_scale_factor(); |
} |
-void RenderWidgetCompositor::setBackgroundColor(WebKit::WebColor color) { |
+void RenderWidgetCompositor::setBackgroundColor(blink::WebColor color) { |
layer_tree_host_->set_background_color(color); |
} |
@@ -484,7 +484,7 @@ void RenderWidgetCompositor::setPageScaleFactorAndLimits( |
} |
void RenderWidgetCompositor::startPageScaleAnimation( |
- const WebKit::WebPoint& destination, |
+ const blink::WebPoint& destination, |
bool use_anchor, |
float new_page_scale, |
double duration_sec) { |
@@ -516,16 +516,16 @@ void RenderWidgetCompositor::didStopFlinging() { |
layer_tree_host_->DidStopFlinging(); |
} |
-void RenderWidgetCompositor::registerForAnimations(WebKit::WebLayer* layer) { |
+void RenderWidgetCompositor::registerForAnimations(blink::WebLayer* layer) { |
cc::Layer* cc_layer = static_cast<webkit::WebLayerImpl*>(layer)->layer(); |
cc_layer->layer_animation_controller()->SetAnimationRegistrar( |
layer_tree_host_->animation_registrar()); |
} |
void RenderWidgetCompositor::registerViewportLayers( |
- const WebKit::WebLayer* pageScaleLayer, |
- const WebKit::WebLayer* innerViewportScrollLayer, |
- const WebKit::WebLayer* outerViewportScrollLayer) { |
+ const blink::WebLayer* pageScaleLayer, |
+ const blink::WebLayer* innerViewportScrollLayer, |
+ const blink::WebLayer* outerViewportScrollLayer) { |
layer_tree_host_->RegisterViewportLayers( |
static_cast<const webkit::WebLayerImpl*>(pageScaleLayer)->layer(), |
static_cast<const webkit::WebLayerImpl*>(innerViewportScrollLayer) |