Made Blink aware of top controls offset (Chromium-side)

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/gpu/render_widget_compositor.h"
 
 #include <limits>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 435 matching lines @@
 
 void RenderWidgetCompositor::UpdateTopControlsState(
     cc::TopControlsState constraints,
     cc::TopControlsState current,
     bool animate) {
   layer_tree_host_->UpdateTopControlsState(constraints,
                                            current,
                                            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) {
   layer_tree_host_->SetNeedsRedrawRect(damage_rect);
 }
 
 void RenderWidgetCompositor::SetNeedsForcedRedraw() {
   layer_tree_host_->SetNextCommitForcesRedraw();
   setNeedsAnimate();
 }
@@ skipping 270 matching lines @@
 }
 
 void RenderWidgetCompositor::setShowScrollBottleneckRects(bool show) {
   cc::LayerTreeDebugState debug_state = layer_tree_host_->debug_state();
   debug_state.show_touch_event_handler_rects = show;
   debug_state.show_wheel_event_handler_rects = show;
   debug_state.show_non_fast_scrollable_rects = 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();
 }
 
 void RenderWidgetCompositor::DidBeginMainFrame() {
   widget_->InstrumentDidBeginFrame();
 }
 
 void RenderWidgetCompositor::BeginMainFrame(const cc::BeginFrameArgs& args) {
   VLOG(2) << "RenderWidgetCompositor::BeginMainFrame";
   begin_main_frame_time_ = args.frame_time;
   begin_main_frame_interval_ = args.interval;
   double frame_time_sec = (args.frame_time - base::TimeTicks()).InSecondsF();
   double deadline_sec = (args.deadline - base::TimeTicks()).InSecondsF();
   double interval_sec = args.interval.InSecondsF();
   WebBeginFrameArgs web_begin_frame_args =
       WebBeginFrameArgs(frame_time_sec, deadline_sec, interval_sec);
   widget_->webwidget()->beginFrame(web_begin_frame_args);
 }
 
 void RenderWidgetCompositor::Layout() {
   widget_->webwidget()->layout();
 }
 
-void RenderWidgetCompositor::ApplyScrollAndScale(
+void RenderWidgetCompositor::ApplyViewportDeltas(
     const gfx::Vector2d& scroll_delta,
-    float page_scale) {
-  widget_->webwidget()->applyScrollAndScale(scroll_delta, page_scale);
+    float page_scale,
+    float top_controls_delta) {
+  widget_->webwidget()->applyViewportDeltas(
+      scroll_delta,
+      page_scale,
+      top_controls_delta);
 }
 
 scoped_ptr<cc::OutputSurface> RenderWidgetCompositor::CreateOutputSurface(
     bool fallback) {
   return widget_->CreateOutputSurface(fallback);
 }
 
 void RenderWidgetCompositor::DidInitializeOutputSurface() {
 }
 
@@ skipping 41 matching lines @@
   widget_->OnSwapBuffersAborted();
 }
 
 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() {
   cc::ContextProvider* provider =
       RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
   provider->ContextGL()->RateLimitOffscreenContextCHROMIUM();
 }
 
 }  // namespace content