Notify main-thread of top controls state changes

content/renderer/gpu/render_widget_compositor.cc

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 b0558b8e5a8a4a1570729cef492639d6c9be7d5d..b5b86e347628a02e1fd7f9e5676af20e78bd684b 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -63,6 +63,7 @@ using blink::WebFloatPoint;
 using blink::WebRect;
 using blink::WebSelectionBound;
 using blink::WebSize;
+using blink::WebTopControlsState;
 
 namespace content {
 namespace {
@@ -154,6 +155,20 @@ gfx::Size CalculateDefaultTileSize() {
   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
@@ -466,23 +481,6 @@ void RenderWidgetCompositor::SetRasterizeOnlyVisibleContent() {
   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);
 }
@@ -748,6 +746,19 @@ void RenderWidgetCompositor::setShowScrollBottleneckRects(bool 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);
 }