Notify main-thread of top controls state changes

content/renderer/render_view_impl_android.cc

 // Copyright (c) 2012 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/render_view_impl.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/trees/layer_tree_host.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/gpu/render_widget_compositor.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 namespace content {
 
-// Check content::TopControlsState and cc::TopControlsState are kept in sync.
+// Check content::TopControlsState , cc::TopControlsState, and
+// blink::WebWidget::TopControlsState are kept in sync.
 static_assert(int(TOP_CONTROLS_STATE_SHOWN) == int(cc::SHOWN),
               "mismatching enums: SHOWN");
+static_assert(int(TOP_CONTROLS_STATE_SHOWN) == int(blink::WebWidget::Shown),
+              "mismatching enums: SHOWN");
 static_assert(int(TOP_CONTROLS_STATE_HIDDEN) == int(cc::HIDDEN),
               "mismatching enums: HIDDEN");
+static_assert(int(TOP_CONTROLS_STATE_HIDDEN) == int(blink::WebWidget::Hidden),
+              "mismatching enums: HIDDEN");
 static_assert(int(TOP_CONTROLS_STATE_BOTH) == int(cc::BOTH),
               "mismatching enums: BOTH");
+static_assert(int(TOP_CONTROLS_STATE_BOTH) == int(blink::WebWidget::Both),
+              "mismatching enums: BOTH");
 
-cc::TopControlsState ContentToCcTopControlsState(
+cc::TopControlsState ContentToCc(
     TopControlsState state) {
   return static_cast<cc::TopControlsState>(state);
 }
 
+// TODO(majidvp) Use a single enum for both cc and blink
+blink::WebWidget::TopControlsState ContentToBlink(
+    TopControlsState state) {
+  return static_cast<blink::WebWidget::TopControlsState>(state);
+}
+
+
 // TODO(mvanouwerkerk): Stop calling this code path and delete it.
 void RenderViewImpl::OnUpdateTopControlsState(bool enable_hiding,
                                               bool enable_showing,
                                               bool animate) {
   // TODO(tedchoc): Investigate why messages are getting here before the
   //                compositor has been initialized.
   LOG_IF(WARNING, !compositor_) << "OnUpdateTopControlsState was unhandled.";
-  if (compositor_) {
-    cc::TopControlsState constraints = cc::BOTH;
-    if (!enable_showing)
-      constraints = cc::HIDDEN;
-    if (!enable_hiding)
-      constraints = cc::SHOWN;
-    cc::TopControlsState current = cc::BOTH;
-    compositor_->UpdateTopControlsState(constraints, current, animate);
-    top_controls_constraints_ = constraints;
-  }
+  TopControlsState constraints = TOP_CONTROLS_STATE_BOTH;
+  if (!enable_showing)
+    constraints = TOP_CONTROLS_STATE_HIDDEN;
+  if (!enable_hiding)
+    constraints = TOP_CONTROLS_STATE_SHOWN;
+  TopControlsState current = TOP_CONTROLS_STATE_BOTH;
+
+  UpdateTopControlsState(constraints, current, animate);
 }
 
 void RenderViewImpl::UpdateTopControlsState(TopControlsState constraints,
                                             TopControlsState current,
                                             bool animate) {
-  cc::TopControlsState constraints_cc =
-      ContentToCcTopControlsState(constraints);
-  cc::TopControlsState current_cc = ContentToCcTopControlsState(current);
-  if (compositor_)
-    compositor_->UpdateTopControlsState(constraints_cc, current_cc, animate);
-  top_controls_constraints_ = constraints_cc;
+  if (compositor_) {
+    compositor_->UpdateTopControlsState(ContentToCc(constraints),

[aelias_OOO_until_Jul13, 2015/02/12 00:45:29]

Instead of having the plumbing fork here, let's plumb the current and animate
back from Blink via WebLayerTreeView API.  That will leave the option open in
the future of things like setting the "current" directly on the main thread
without notifying CC.

[majidvp, 2015/02/12 13:51:48]

That sounds good. In which case to be consistent I suggest we do the same for
TopContrtolsHeight, and TopControlsShrinkBlinkSize and plumb them from Blink to
CC via WebLayerTreeView API and remove it from here:
https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/r...

[aelias_OOO_until_Jul13, 2015/02/12 19:24:54]

Sounds good, go ahead.

+                                        ContentToCc(current),
+                                        animate);
+  }
+  if (webwidget()) {
+    webwidget()->updateTopControlsState(ContentToBlink(constraints),
+                                        ContentToBlink(current),
+                                        animate);
+  }
+
+  top_controls_constraints_ = constraints;
 }
 
 void RenderViewImpl::didScrollWithKeyboard(const blink::WebSize& delta) {
   if (delta.height == 0)
     return;
-  if (compositor_) {
-    cc::TopControlsState current = delta.height < 0 ? cc::SHOWN : cc::HIDDEN;
-    compositor_->UpdateTopControlsState(top_controls_constraints_,
-                                        current,
-                                        true);
-  }
+
+  TopControlsState current = delta.height < 0 ? TOP_CONTROLS_STATE_SHOWN
+                                              : TOP_CONTROLS_STATE_HIDDEN;
+
+  UpdateTopControlsState(top_controls_constraints_, current, true);
 }
 
 void RenderViewImpl::OnExtractSmartClipData(const gfx::Rect& rect) {
   blink::WebString clip_text;
   blink::WebString clip_html;
   blink::WebRect clip_rect;
   webview()->extractSmartClipData(rect, clip_text, clip_html, clip_rect);
   Send(new ViewHostMsg_SmartClipDataExtracted(
       routing_id_, clip_text, clip_html, clip_rect));
 }
 
 }  // namespace content