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

Unified Diff: webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h

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.h
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h
index b8d980fe1825fa47a36e5cbb5f32b5f6c5b5eda4..ffd3b8fe91c621d9f8fedffdd95c0495d4d626ab 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h
@@ -16,8 +16,9 @@ class LayerTreeHost;
class Thread;
}
-namespace WebKit {
-class WebLayer;
+namespace WebKit { class WebLayer; }
+
+namespace webkit {
class WebLayerTreeViewImplForTesting : public WebKit::WebLayerTreeView,
public cc::LayerTreeHostClient {
@@ -30,23 +31,23 @@ class WebLayerTreeViewImplForTesting : public WebKit::WebLayerTreeView,
WEBKIT_COMPOSITOR_BINDINGS_EXPORT bool initialize(
scoped_ptr<cc::Thread> compositor_thread);
- // WebLayerTreeView implementation.
+ // WebKit::WebLayerTreeView implementation.
virtual void setSurfaceReady();
- virtual void setRootLayer(const WebLayer&);
+ virtual void setRootLayer(const WebKit::WebLayer& layer);
virtual void clearRootLayer();
- virtual void setViewportSize(const WebSize& layout_viewport_size,
- const WebSize& device_viewport_size);
- virtual WebSize layoutViewportSize() const;
- virtual WebSize deviceViewportSize() const;
- virtual void setDeviceScaleFactor(float);
+ virtual void setViewportSize(const WebKit::WebSize& layout_viewport_size,
+ const WebKit::WebSize& device_viewport_size);
+ virtual WebKit::WebSize layoutViewportSize() const;
+ virtual WebKit::WebSize deviceViewportSize() const;
+ virtual void setDeviceScaleFactor(float scale_factor);
virtual float deviceScaleFactor() const;
- virtual void setBackgroundColor(WebColor);
- virtual void setHasTransparentBackground(bool);
- virtual void setVisible(bool);
+ virtual void setBackgroundColor(WebKit::WebColor);
+ virtual void setHasTransparentBackground(bool transparent);
+ virtual void setVisible(bool visible);
virtual void setPageScaleFactorAndLimits(float page_scale_factor,
float minimum,
float maximum);
- virtual void startPageScaleAnimation(const WebPoint& destination,
+ virtual void startPageScaleAnimation(const WebKit::WebPoint& destination,
bool use_anchor,
float new_page_scale,
double duration_sec);
@@ -56,10 +57,10 @@ class WebLayerTreeViewImplForTesting : public WebKit::WebLayerTreeView,
virtual void composite();
virtual void updateAnimations(double frame_begin_time);
virtual void didStopFlinging();
- virtual bool compositeAndReadback(void* pixels, const WebRect&);
+ virtual bool compositeAndReadback(void* pixels, const WebKit::WebRect& rect);
virtual void finishAllRendering();
virtual void setDeferCommits(bool defer_commits);
- virtual void renderingStats(WebRenderingStats&) const;
+ virtual void renderingStats(WebKit::WebRenderingStats& stats) const;
// cc::LayerTreeHostClient implementation.
virtual void willBeginFrame() OVERRIDE;
@@ -85,8 +86,10 @@ class WebLayerTreeViewImplForTesting : public WebKit::WebLayerTreeView,
webkit_support::LayerTreeViewType type_;
webkit_support::DRTLayerTreeViewClient* client_;
scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
+
+ DISALLOW_COPY_AND_ASSIGN(WebLayerTreeViewImplForTesting);
};
-} // namespace Web_kit
+} // namespace webkit
#endif // WEBKIT_COMPOSITOR_BINDINGS_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_

Powered by Google App Engine
This is Rietveld 408576698