| Index: content/renderer/gpu/render_widget_compositor.cc
|
| diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
|
| index b9d7a019b13368dd617cd0a4601e0cf6c75e6aef..aed5df9ce6a11982caf7c66c05c3e053c10c6cad 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -447,9 +447,8 @@ void RenderWidgetCompositor::UpdateTopControlsState(
|
| animate);
|
| }
|
|
|
| -void RenderWidgetCompositor::SetTopControlsLayoutHeight(
|
| - float top_controls_layout_height) {
|
| - layer_tree_host_->SetTopControlsLayoutHeight(top_controls_layout_height);
|
| +void RenderWidgetCompositor::SetTopControlsLayoutHeight(float height) {
|
| + layer_tree_host_->SetTopControlsLayoutHeight(height);
|
| }
|
|
|
| void RenderWidgetCompositor::SetNeedsRedrawRect(gfx::Rect damage_rect) {
|
| @@ -740,6 +739,10 @@ void RenderWidgetCompositor::setShowScrollBottleneckRects(bool show) {
|
| layer_tree_host_->SetDebugState(debug_state);
|
| }
|
|
|
| +void RenderWidgetCompositor::setTopControlsContentOffset(float offset) {
|
| + layer_tree_host_->SetTopControlsContentOffset(offset);
|
| +}
|
| +
|
| void RenderWidgetCompositor::WillBeginMainFrame(int frame_id) {
|
| widget_->InstrumentWillBeginFrame(frame_id);
|
| widget_->willBeginCompositorFrame();
|
| @@ -759,10 +762,14 @@ void RenderWidgetCompositor::Layout() {
|
| widget_->webwidget()->layout();
|
| }
|
|
|
| -void RenderWidgetCompositor::ApplyScrollAndScale(
|
| +void RenderWidgetCompositor::ApplyViewportProperties(
|
| const gfx::Vector2d& scroll_delta,
|
| - float page_scale) {
|
| - widget_->webwidget()->applyScrollAndScale(scroll_delta, page_scale);
|
| + float page_scale,
|
| + float top_controls_delta) {
|
| + widget_->webwidget()->applyViewportProperties(
|
| + scroll_delta,
|
| + page_scale,
|
| + top_controls_delta);
|
| }
|
|
|
| scoped_ptr<cc::OutputSurface> RenderWidgetCompositor::CreateOutputSurface(
|
|
|