Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2190)

Unified Diff: content/test/web_layer_tree_view_impl_for_testing.cc

Issue 470983004: Move blink<->cc bindings to cc/blink (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/test_webkit_platform_support.h ('k') | mojo/aura/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e3f5fd5cc0c0dcd7950adfc9fe11431c099b017e..e183c2aa7ebd2f1855fc3e770ff61b1d8ae4b3af 100644
--- a/content/test/web_layer_tree_view_impl_for_testing.cc
+++ b/content/test/web_layer_tree_view_impl_for_testing.cc
@@ -8,12 +8,12 @@
#include "base/strings/string_number_conversions.h"
#include "base/synchronization/lock.h"
#include "cc/base/switches.h"
+#include "cc/blink/web_layer_impl.h"
#include "cc/input/input_handler.h"
#include "cc/layers/layer.h"
#include "cc/output/output_surface.h"
#include "cc/test/test_context_provider.h"
#include "cc/trees/layer_tree_host.h"
-#include "content/renderer/compositor_bindings/web_layer_impl.h"
#include "content/test/test_webkit_platform_support.h"
#include "third_party/WebKit/public/platform/Platform.h"
#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
@@ -54,7 +54,7 @@ void WebLayerTreeViewImplForTesting::setSurfaceReady() {
void WebLayerTreeViewImplForTesting::setRootLayer(
const blink::WebLayer& root) {
layer_tree_host_->SetRootLayer(
- static_cast<const WebLayerImpl*>(&root)->layer());
+ static_cast<const cc_blink::WebLayerImpl*>(&root)->layer());
}
void WebLayerTreeViewImplForTesting::clearRootLayer() {
@@ -152,13 +152,14 @@ void WebLayerTreeViewImplForTesting::registerViewportLayers(
const blink::WebLayer* innerViewportScrollLayer,
const blink::WebLayer* outerViewportScrollLayer) {
layer_tree_host_->RegisterViewportLayers(
- static_cast<const WebLayerImpl*>(pageScaleLayer)->layer(),
- static_cast<const WebLayerImpl*>(innerViewportScrollLayer)->layer(),
+ static_cast<const cc_blink::WebLayerImpl*>(pageScaleLayer)->layer(),
+ static_cast<const cc_blink::WebLayerImpl*>(innerViewportScrollLayer)
+ ->layer(),
// The outer viewport layer will only exist when using pinch virtual
// viewports.
- outerViewportScrollLayer
- ? static_cast<const WebLayerImpl*>(outerViewportScrollLayer)->layer()
- : NULL);
+ outerViewportScrollLayer ? static_cast<const cc_blink::WebLayerImpl*>(
+ outerViewportScrollLayer)->layer()
+ : NULL);
}
void WebLayerTreeViewImplForTesting::clearViewportLayers() {
« no previous file with comments | « content/test/test_webkit_platform_support.h ('k') | mojo/aura/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698