Notify main-thread of top controls state changes

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 45 matching lines @@
 
 namespace cc {
 class Layer;
 }
 
 using blink::WebBeginFrameArgs;
 using blink::WebFloatPoint;
 using blink::WebRect;
 using blink::WebSelectionBound;
 using blink::WebSize;
+using blink::WebTopControlsState;
 
 namespace content {
 namespace {
 
 bool GetSwitchValueAsInt(const base::CommandLine& command_line,
                          const std::string& switch_string,
                          int min_value,
                          int max_value,
                          int* result) {
   std::string string_value = command_line.GetSwitchValueASCII(switch_string);
@@ skipping 71 matching lines @@
     int numTiles = (display_width * display_height) / (256 * 256);
     if (numTiles > 16)
       default_tile_size = 384;
     if (numTiles >= 40)
       default_tile_size = 512;
   }
 #endif
   return gfx::Size(default_tile_size, default_tile_size);
 }
 
+// Check cc::TopControlsState, and blink::WebTopControlsState
+// are kept in sync.
+static_assert(int(blink::WebTopControlsBoth) == int(cc::BOTH),
+              "mismatching enums: BOTH");
+static_assert(int(blink::WebTopControlsHidden) == int(cc::HIDDEN),
+              "mismatching enums: HIDDEN");
+static_assert(int(blink::WebTopControlsShown) == int(cc::SHOWN),
+              "mismatching enums: SHOWN");
+
+static cc::TopControlsState ConvertTopControlsState(

[no sievers, 2015/02/19 19:51:37]

nit: don't need static here since you are in the anonymous namespace

+    WebTopControlsState state) {
+  return static_cast<cc::TopControlsState>(state);
+}
+
 }  // namespace
 
 // static
 scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
     RenderWidget* widget,
     CompositorDependencies* compositor_deps) {
   scoped_ptr<RenderWidgetCompositor> compositor(
       new RenderWidgetCompositor(widget, compositor_deps));
   compositor->Initialize();
   return compositor;
@@ skipping 292 matching lines @@
 void RenderWidgetCompositor::SetNeedsDisplayOnAllLayers() {
   layer_tree_host_->SetNeedsDisplayOnAllLayers();
 }
 
 void RenderWidgetCompositor::SetRasterizeOnlyVisibleContent() {
   cc::LayerTreeDebugState current = layer_tree_host_->debug_state();
   current.rasterize_only_visible_content = true;
   layer_tree_host_->SetDebugState(current);
 }
 
-void RenderWidgetCompositor::UpdateTopControlsState(
-    cc::TopControlsState constraints,
-    cc::TopControlsState current,
-    bool animate) {
-  layer_tree_host_->UpdateTopControlsState(constraints,
-                                           current,
-                                           animate);
-}
-
-void RenderWidgetCompositor::SetTopControlsShrinkBlinkSize(bool shrink) {
-  layer_tree_host_->SetTopControlsShrinkBlinkSize(shrink);
-}
-
-void RenderWidgetCompositor::SetTopControlsHeight(float height) {
-  layer_tree_host_->SetTopControlsHeight(height);
-}
-
 void RenderWidgetCompositor::SetNeedsRedrawRect(gfx::Rect damage_rect) {
   layer_tree_host_->SetNeedsRedrawRect(damage_rect);
 }
 
 void RenderWidgetCompositor::SetNeedsForcedRedraw() {
   layer_tree_host_->SetNextCommitForcesRedraw();
   setNeedsAnimate();
 }
 
 scoped_ptr<cc::SwapPromiseMonitor>
@@ skipping 245 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::updateTopControlsState(
+    WebTopControlsState constraints,
+    WebTopControlsState current,
+    bool animate) {
+  layer_tree_host_->UpdateTopControlsState(ConvertTopControlsState(constraints),
+                                           ConvertTopControlsState(current),
+                                           animate);
+}
+
+void RenderWidgetCompositor::setTopControlsHeight(float height, bool shrink) {
+    layer_tree_host_->SetTopControlsHeight(height, shrink);

[no sievers, 2015/02/19 19:51:37]

nit: indent

+}
+
 void RenderWidgetCompositor::setTopControlsContentOffset(float offset) {
   setTopControlsShownRatio(offset);
 }
 
 void RenderWidgetCompositor::setTopControlsShownRatio(float ratio) {
   layer_tree_host_->SetTopControlsShownRatio(ratio);
 }
 
 void RenderWidgetCompositor::WillBeginMainFrame() {
   widget_->willBeginCompositorFrame();
@@ skipping 118 matching lines @@
   widget_->OnSwapBuffersAborted();
 }
 
 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() {
   cc::ContextProvider* provider =
       compositor_deps_->GetSharedMainThreadContextProvider();
   provider->ContextGL()->RateLimitOffscreenContextCHROMIUM();
 }
 
 }  // namespace content