| Index: content/test/web_layer_tree_view_impl_for_testing.cc
|
| diff --git a/content/test/web_layer_tree_view_impl_for_testing.cc b/content/test/web_layer_tree_view_impl_for_testing.cc
|
| index 64be748b3f7de9a725a99b84ff8ebebf2eb8736d..32965bd0cd2e71a3e51ef0a182990e05536617bb 100644
|
| --- a/content/test/web_layer_tree_view_impl_for_testing.cc
|
| +++ b/content/test/web_layer_tree_view_impl_for_testing.cc
|
| @@ -24,11 +24,11 @@
|
| #include "webkit/common/gpu/test_context_provider_factory.h"
|
| #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
|
|
|
| -using WebKit::WebColor;
|
| -using WebKit::WebGraphicsContext3D;
|
| -using WebKit::WebRect;
|
| -using WebKit::WebRenderingStats;
|
| -using WebKit::WebSize;
|
| +using blink::WebColor;
|
| +using blink::WebGraphicsContext3D;
|
| +using blink::WebRect;
|
| +using blink::WebRenderingStats;
|
| +using blink::WebSize;
|
|
|
| namespace webkit {
|
|
|
| @@ -56,7 +56,7 @@ void WebLayerTreeViewImplForTesting::setSurfaceReady() {
|
| }
|
|
|
| void WebLayerTreeViewImplForTesting::setRootLayer(
|
| - const WebKit::WebLayer& root) {
|
| + const blink::WebLayer& root) {
|
| layer_tree_host_->SetRootLayer(
|
| static_cast<const WebLayerImpl*>(&root)->layer());
|
| }
|
| @@ -110,7 +110,7 @@ void WebLayerTreeViewImplForTesting::setPageScaleFactorAndLimits(
|
| }
|
|
|
| void WebLayerTreeViewImplForTesting::startPageScaleAnimation(
|
| - const WebKit::WebPoint& scroll,
|
| + const blink::WebPoint& scroll,
|
| bool use_anchor,
|
| float new_page_scale,
|
| double duration_sec) {}
|
|
|