| 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 f17a6d236905c852e27e91c111d713a6f32afb6c..60bf3bde9f652af06032b0f9060b9f85e098db1b 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;
|
|
|