Resolves layering violation in SynchronousCompositorHost creation

content/browser/web_contents/web_contents_view_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/browser/web_contents/web_contents_view_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "cc/layers/layer.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/browser/web_contents/web_contents_android.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/drop_data.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/android/device_display_info.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/image/image_skia.h"
 
 using base::android::AttachCurrentThread;
@@ skipping 13 matching lines @@
   results->device_scale_factor = display.device_scale_factor();
   results->orientation_angle = display.RotationAsDegree();
   results->orientation_type =
       RenderWidgetHostViewBase::GetOrientationTypeForMobile(display);
   gfx::DeviceDisplayInfo info;
   results->depth = display.color_depth();
   results->depth_per_component = display.depth_per_component();
   results->is_monochrome = display.is_monochrome();
 }
 
+// static
+void SynchronousCompositor::SetClientForWebContents(
+    WebContents* contents,
+    SynchronousCompositorClient* client) {
+  DCHECK(contents);
+  DCHECK(client);
+  WebContentsViewAndroid* wcva = static_cast<WebContentsViewAndroid*>(
+      static_cast<WebContentsImpl*>(contents)->GetView());
+  DCHECK(!wcva->synchronous_compositor_client());
+  wcva->set_synchronous_compositor_client(client);
+}
+
 WebContentsView* CreateWebContentsView(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate,
     RenderViewHostDelegateView** render_view_host_delegate_view) {
   WebContentsViewAndroid* rv = new WebContentsViewAndroid(
       web_contents, delegate);
   *render_view_host_delegate_view = rv;
   return rv;
 }
 
 WebContentsViewAndroid::WebContentsViewAndroid(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate)
     : web_contents_(web_contents),
       content_view_core_(NULL),
-      delegate_(delegate) {
+      delegate_(delegate),
+      synchronous_compositor_client_(nullptr) {
 }
 
 WebContentsViewAndroid::~WebContentsViewAndroid() {
   if (view_.GetLayer())
     view_.GetLayer()->RemoveFromParent();
 }
 
 void WebContentsViewAndroid::SetContentViewCore(
     ContentViewCoreImpl* content_view_core) {
   content_view_core_ = content_view_core;
   RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
       web_contents_->GetRenderWidgetHostView());
-  if (rwhv)
-    rwhv->SetContentViewCore(content_view_core_);
-
+  if (rwhv) {
+      rwhv->SetContentViewCore(content_view_core);
+      SetSynchronousCompositorClientFor(rwhv);

[boliu, 2016/11/08 16:50:13]

I don't think this needs to be tied to CVC events

The only thing that matters is the order of "new RWHVA" vs
SetClientForWebContents. Unfortunately the are allowed to happen in both orders
(in particular, RWHVA is created first for pop ups)

so only need to do this in CreateViewForWidget and in SetClientForWebContents

[Jinsuk Kim, 2016/11/08 17:18:30]

Good to know. Done.

+  }
   if (web_contents_->ShowingInterstitialPage()) {
     rwhv = static_cast<RenderWidgetHostViewAndroid*>(
         web_contents_->GetInterstitialPage()
             ->GetMainFrame()
             ->GetRenderViewHost()
             ->GetWidget()
             ->GetView());
-    if (rwhv)
-      rwhv->SetContentViewCore(content_view_core_);
+    if (rwhv) {
+        rwhv->SetContentViewCore(content_view_core);
+        SetSynchronousCompositorClientFor(rwhv);
+    }
   }
 }
 
+void WebContentsViewAndroid::SetSynchronousCompositorClientFor(
+    RenderWidgetHostViewAndroid* rwhv) {
+  if (synchronous_compositor_client_)

[boliu, 2016/11/08 16:50:13]

no need for this check

[Jinsuk Kim, 2016/11/08 17:18:30]

Done. Inlined now that it became just one liner.

+    rwhv->set_synchronous_compositor_client(synchronous_compositor_client_);
+}
+
 gfx::NativeView WebContentsViewAndroid::GetNativeView() const {
   return const_cast<gfx::NativeView>(&view_);
 }
 
 gfx::NativeView WebContentsViewAndroid::GetContentNativeView() const {
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (rwhv)
     return rwhv->GetNativeView();
 
   // TODO(sievers): This should return null.
@@ skipping 20 matching lines @@
 }
 
 void WebContentsViewAndroid::SizeContents(const gfx::Size& size) {
   // TODO(klobag): Do we need to do anything else?
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetSize(size);
 }
 
 void WebContentsViewAndroid::Focus() {
-  if (web_contents_->ShowingInterstitialPage())
+  RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(

[boliu, 2016/11/08 16:50:13]

unrelated change

[Jinsuk Kim, 2016/11/08 17:18:30]

Oops.. reverted.

+      web_contents_->GetRenderWidgetHostView());
+  if (web_contents_->ShowingInterstitialPage()) {
     web_contents_->GetInterstitialPage()->Focus();
-  else
-    web_contents_->GetRenderWidgetHostView()->Focus();
+    if (content_view_core_)
+      content_view_core_->ForceUpdateImeAdapter(rwhv->GetNativeImeAdapter());
+  } else {
+    rwhv->Focus();
+  }
 }
 
 void WebContentsViewAndroid::SetInitialFocus() {
   if (web_contents_->FocusLocationBarByDefault())
     web_contents_->SetFocusToLocationBar(false);
   else
     Focus();
 }
 
 void WebContentsViewAndroid::StoreFocus() {
@@ skipping 177 matching lines @@
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void WebContentsViewAndroid::TakeFocus(bool reverse) {
   if (web_contents_->GetDelegate() &&
       web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse))
     return;
   web_contents_->GetRenderWidgetHostView()->Focus();
 }
 
 } // namespace content