Remove access to WebContents in RWHVA::SynchronousFrameMetadata()

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 41 matching lines @@
 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);
+  }
   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) {
+  WebContentsAndroid* web_contents_android =
+    static_cast<WebContentsImpl*>(web_contents_)->GetWebContentsAndroid();

[boliu, 2016/11/08 00:13:55]

I think WCVA could just hold SCClient directly, and then don't need to involve
WebContentsAndroid?

You could even move the SynchronousCompositor::SetClientForWebContents
implementation here, which "sorta" fixes the SCH dependency on WebContents.

[Jinsuk Kim, 2016/11/08 17:58:19]

Good idea. Addressed in the new patch.

+  SynchronousCompositorClient* client =
+      web_contents_android->synchronous_compositor_client();
+  if (client)
+    rwhv->set_synchronous_compositor_client(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*>(
+      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