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

Unified Diff: webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc

Issue 12496013: Move compositor bindings implementations out of WebKit::, fix style (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 9 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
Index: webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc
index 7d1d3a7d97386a8ae9ec6cae07791aceaddd485a..9d618c90a7bbc901d9e18c0f515676910c9a52be 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc
@@ -31,7 +31,14 @@
#include "webkit/gpu/test_context_provider_factory.h"
#include "webkit/support/test_webkit_platform_support.h"
-namespace WebKit {
+using WebKit::WebColor;
+using WebKit::WebGraphicsContext3D;
+using WebKit::WebRect;
+using WebKit::WebRenderingStats;
+using WebKit::WebSize;
+
+namespace webkit {
+
WebLayerTreeViewImplForTesting::WebLayerTreeViewImplForTesting(
webkit_support::LayerTreeViewType type,
webkit_support::DRTLayerTreeViewClient* client)
@@ -57,7 +64,8 @@ void WebLayerTreeViewImplForTesting::setSurfaceReady() {
layer_tree_host_->SetSurfaceReady();
}
-void WebLayerTreeViewImplForTesting::setRootLayer(const WebLayer& root) {
+void WebLayerTreeViewImplForTesting::setRootLayer(
+ const WebKit::WebLayer& root) {
layer_tree_host_->SetRootLayer(
static_cast<const WebLayerImpl*>(&root)->layer());
}
@@ -111,7 +119,7 @@ void WebLayerTreeViewImplForTesting::setPageScaleFactorAndLimits(
}
void WebLayerTreeViewImplForTesting::startPageScaleAnimation(
- const WebPoint& scroll,
+ const WebKit::WebPoint& scroll,
bool use_anchor,
float new_page_scale,
double duration_sec) {}
@@ -233,4 +241,4 @@ WebLayerTreeViewImplForTesting::OffscreenContextProviderForCompositorThread() {
OffscreenContextProviderForCompositorThread();
}
-} // namespace WebKit
+} // namespace webkit

Powered by Google App Engine
This is Rietveld 408576698