Index: content/renderer/gpu/render_widget_compositor.h |
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h |
index d3019ce6ff7a773084390e5486a5167db82fdcf0..66d29cc8e6cc16000570321a94648ae4472db22d 100644 |
--- a/content/renderer/gpu/render_widget_compositor.h |
+++ b/content/renderer/gpu/render_widget_compositor.h |
@@ -30,7 +30,7 @@ class LayerTreeHost; |
namespace content { |
class RenderWidget; |
-class RenderWidgetCompositor : public WebKit::WebLayerTreeView, |
+class RenderWidgetCompositor : public blink::WebLayerTreeView, |
public cc::LayerTreeHostClient { |
public: |
// Attempt to construct and initialize a compositor instance for the widget |
@@ -67,25 +67,25 @@ class RenderWidgetCompositor : public WebKit::WebLayerTreeView, |
// 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 WebKit::WebFloatPoint adjustEventPointForPinchZoom( |
- const WebKit::WebFloatPoint& point) const; |
+ const blink::WebSize& unused_deprecated, |
+ const blink::WebSize& device_viewport_size); |
+ virtual blink::WebSize layoutViewportSize() const; |
+ virtual blink::WebSize deviceViewportSize() const; |
+ virtual blink::WebFloatPoint adjustEventPointForPinchZoom( |
+ const blink::WebFloatPoint& point) const; |
virtual void setDeviceScaleFactor(float device_scale); |
virtual float deviceScaleFactor() const; |
- virtual void setBackgroundColor(WebKit::WebColor color); |
+ virtual void setBackgroundColor(blink::WebColor color); |
virtual void setHasTransparentBackground(bool transparent); |
virtual void setOverhangBitmap(const SkBitmap& bitmap); |
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); |
@@ -93,16 +93,16 @@ class RenderWidgetCompositor : public WebKit::WebLayerTreeView, |
virtual void setNeedsRedraw(); |
virtual bool commitRequested() const; |
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 registerForAnimations(WebKit::WebLayer* layer); |
+ virtual void registerForAnimations(blink::WebLayer* layer); |
virtual void registerViewportLayers( |
- const WebKit::WebLayer* pageScaleLayer, |
- const WebKit::WebLayer* innerViewportScrollLayer, |
- const WebKit::WebLayer* outerViewportScrollLayer) OVERRIDE; |
+ const blink::WebLayer* pageScaleLayer, |
+ const blink::WebLayer* innerViewportScrollLayer, |
+ const blink::WebLayer* outerViewportScrollLayer) OVERRIDE; |
virtual void clearViewportLayers() OVERRIDE; |
- virtual void renderingStats(WebKit::WebRenderingStats& stats) const {} |
+ virtual void renderingStats(blink::WebRenderingStats& stats) const {} |
virtual void setShowFPSCounter(bool show); |
virtual void setShowPaintRects(bool show); |
virtual void setShowDebugBorders(bool show); |