| 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 fc8d60ed9af4395661045928ef1efd09e0d700e4..84604bc4835d32e155238c214efa406e6782f090 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.h
|
| +++ b/content/renderer/gpu/render_widget_compositor.h
|
| @@ -50,7 +50,7 @@ class RenderWidgetCompositor : public blink::WebLayerTreeView,
|
| void UpdateTopControlsState(cc::TopControlsState constraints,
|
| cc::TopControlsState current,
|
| bool animate);
|
| - void SetTopControlsLayoutHeight(float top_controls_layout_height);
|
| + void SetTopControlsLayoutHeight(float height);
|
| void SetNeedsRedrawRect(gfx::Rect damage_rect);
|
| // Like setNeedsRedraw but forces the frame to be drawn, without early-outs.
|
| // Redraw will be forced after the next commit
|
| @@ -123,14 +123,16 @@ class RenderWidgetCompositor : public blink::WebLayerTreeView,
|
| virtual void setShowDebugBorders(bool show);
|
| virtual void setContinuousPaintingEnabled(bool enabled);
|
| virtual void setShowScrollBottleneckRects(bool show);
|
| + virtual void setTopControlsContentOffset(float);
|
|
|
| // cc::LayerTreeHostClient implementation.
|
| virtual void WillBeginMainFrame(int frame_id) OVERRIDE;
|
| virtual void DidBeginMainFrame() OVERRIDE;
|
| virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE;
|
| virtual void Layout() OVERRIDE;
|
| - virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta,
|
| - float page_scale) OVERRIDE;
|
| + virtual void ApplyViewportProperties(const gfx::Vector2d& scroll_delta,
|
| + float page_scale,
|
| + float top_controls_delta) OVERRIDE;
|
| virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback)
|
| OVERRIDE;
|
| virtual void DidInitializeOutputSurface() OVERRIDE;
|
|
|