| Index: content/test/web_layer_tree_view_impl_for_testing.h
|
| diff --git a/content/test/web_layer_tree_view_impl_for_testing.h b/content/test/web_layer_tree_view_impl_for_testing.h
|
| index 8811ac042ad2817201287734fe9b79df89e11768..fc690a2c2397a3617da176873361ece120059f72 100644
|
| --- a/content/test/web_layer_tree_view_impl_for_testing.h
|
| +++ b/content/test/web_layer_tree_view_impl_for_testing.h
|
| @@ -13,11 +13,11 @@ namespace cc {
|
| class LayerTreeHost;
|
| }
|
|
|
| -namespace WebKit { class WebLayer; }
|
| +namespace blink { class WebLayer; }
|
|
|
| namespace webkit {
|
|
|
| -class WebLayerTreeViewImplForTesting : public WebKit::WebLayerTreeView,
|
| +class WebLayerTreeViewImplForTesting : public blink::WebLayerTreeView,
|
| public cc::LayerTreeHostClient {
|
| public:
|
| WebLayerTreeViewImplForTesting();
|
| @@ -25,23 +25,23 @@ class WebLayerTreeViewImplForTesting : public WebKit::WebLayerTreeView,
|
|
|
| bool Initialize();
|
|
|
| - // WebKit::WebLayerTreeView implementation.
|
| + // blink::WebLayerTreeView implementation.
|
| virtual void setSurfaceReady();
|
| - virtual void setRootLayer(const WebKit::WebLayer& layer);
|
| + virtual void setRootLayer(const blink::WebLayer& layer);
|
| virtual void clearRootLayer();
|
| - virtual void setViewportSize(const WebKit::WebSize& unused_deprecated,
|
| - const WebKit::WebSize& device_viewport_size);
|
| - virtual WebKit::WebSize layoutViewportSize() const;
|
| - virtual WebKit::WebSize deviceViewportSize() const;
|
| + virtual void setViewportSize(const blink::WebSize& unused_deprecated,
|
| + const blink::WebSize& device_viewport_size);
|
| + virtual blink::WebSize layoutViewportSize() const;
|
| + virtual blink::WebSize deviceViewportSize() const;
|
| virtual void setDeviceScaleFactor(float scale_factor);
|
| virtual float deviceScaleFactor() const;
|
| - virtual void setBackgroundColor(WebKit::WebColor);
|
| + virtual void setBackgroundColor(blink::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 WebKit::WebPoint& destination,
|
| + virtual void startPageScaleAnimation(const blink::WebPoint& destination,
|
| bool use_anchor,
|
| float new_page_scale,
|
| double duration_sec);
|
| @@ -50,11 +50,11 @@ class WebLayerTreeViewImplForTesting : public WebKit::WebLayerTreeView,
|
| virtual bool commitRequested() const;
|
| virtual void composite();
|
| virtual void didStopFlinging();
|
| - virtual bool compositeAndReadback(void* pixels, const WebKit::WebRect& rect);
|
| + virtual bool compositeAndReadback(void* pixels, const blink::WebRect& rect);
|
| virtual void finishAllRendering();
|
| virtual void setDeferCommits(bool defer_commits);
|
| virtual void renderingStats(
|
| - WebKit::WebRenderingStats& stats) const; // NOLINT(runtime/references)
|
| + blink::WebRenderingStats& stats) const; // NOLINT(runtime/references)
|
|
|
| // cc::LayerTreeHostClient implementation.
|
| virtual void WillBeginMainFrame() OVERRIDE {}
|
|
|