Android: Remove references to ContentViewCore in RWHVA

Now we got only a handful of references to ContentViewCore object
left in RenderWidgetHostViewAndroid.

All but 3 are all null checks trying to see if content_view_core_
is set to null or not, which is equivalent to checking if the native
view (ViewAndroid) of ContentViewCore and its own native view form
a view tree or not. This can be replaced simply by a boolean flag.

The only 3 are significant (i.e. invoking methods of CVC)

ContentViewCore::GetViewAndroid() - RWHVA may not have an access
    to the parent native view. It should be passed to RWHVA instead.

ContentViewCore::RequestDisallowInterceptTouchEvent() - It goes up
    to Java container view to invoke
    android.view.View.requestDisallowInterceptTouchEvent.
    One more move from CVC to ViewAndroidDelegate...

ContentViewCore::GetWindowAndroid() : same WindowAndroid (or null
    if not attached to view tree) can be obtained via
    ViewAndroid::GetWindowAndroid().

Bug: 626765
Change-Id: I80088c6a9ca2ca0047184ac77f84f08f64ff0acb
Reviewed-on: https://chromium-review.googlesource.com/958646
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542999}

content/browser/android/content_view_core.cc

@@ -233,12 +233,12 @@ void ContentViewCore::RenderViewHostChanged(RenderViewHost* old_host,
         static_cast<RenderWidgetHostViewAndroid*>(
             old_host->GetWidget()->GetView());
     if (view)
-      view->SetContentViewCore(NULL);
+      view->UpdateNativeViewTree(nullptr);
 
     view = static_cast<RenderWidgetHostViewAndroid*>(
         new_host->GetWidget()->GetView());
     if (view)
-      view->SetContentViewCore(this);
+      view->UpdateNativeViewTree(GetViewAndroid());
   }
   int new_pid =
       GetRenderProcessIdFromRenderViewHost(web_contents_->GetRenderViewHost());
@@ -282,13 +282,6 @@ jint ContentViewCore::GetBackgroundColor(JNIEnv* env, jobject obj) {
   return rwhva->GetCachedBackgroundColor();
 }
 
-void ContentViewCore::RequestDisallowInterceptTouchEvent() {
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
-  if (!obj.is_null())
-    Java_ContentViewCoreImpl_requestDisallowInterceptTouchEvent(env, obj);
-}
-
 void ContentViewCore::SendScreenRectsAndResizeWidget() {
   RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid();
   if (view) {

content/browser/android/content_view_core.h

@@ -137,8 +137,6 @@ class ContentViewCore : public WebContentsObserver {
 
   void HidePopupsAndPreserveSelection();
 
-  void RequestDisallowInterceptTouchEvent();
-
   // Returns the context with which the ContentViewCore was created, typically
   // the Activity context.
   base::android::ScopedJavaLocalRef<jobject> GetContext() const;

content/browser/renderer_host/render_widget_host_view_android.h

@@ -47,7 +47,6 @@ struct DidOverscrollParams;
 }
 
 namespace content {
-class ContentViewCore;
 class GestureListenerManager;
 class ImeAdapterAndroid;
 class OverscrollControllerAndroid;
@@ -79,7 +78,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
       public viz::BeginFrameObserver {
  public:
   RenderWidgetHostViewAndroid(RenderWidgetHostImpl* widget,
-                              ContentViewCore* content_view_core);
+                              gfx::NativeView parent_native_view);
   ~RenderWidgetHostViewAndroid() override;
 
   // Interface used to observe the destruction of a RenderWidgetHostViewAndroid.
@@ -251,7 +250,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
   bool WantsAnimateOnlyBeginFrames() const override;
 
   // Non-virtual methods
-  void SetContentViewCore(ContentViewCore* content_view_core);
+  void UpdateNativeViewTree(gfx::NativeView parent_native_view);
   void OnContentViewCoreDestroyed();
   SkColor GetCachedBackgroundColor() const;
   void SendKeyEvent(const NativeWebKeyboardEvent& event);
@@ -416,9 +415,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
   // appearance of overscroll glow and the keyboard.
   bool is_in_vr_;
 
-  // ContentViewCore is our interface to the view system.
-  ContentViewCore* content_view_core_;
-
   ImeAdapterAndroid* ime_adapter_android_;
   TapDisambiguator* tap_disambiguator_;
   SelectionPopupController* selection_popup_controller_;

content/browser/web_contents/web_contents_view_android.cc

@@ -103,7 +103,7 @@ void WebContentsViewAndroid::SetContentViewCore(
   content_view_core_ = content_view_core;
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
   if (rwhv)
-    rwhv->SetContentViewCore(content_view_core_);
+    rwhv->UpdateNativeViewTree(&view_);
 
   if (web_contents_->ShowingInterstitialPage()) {
     rwhv = static_cast<RenderWidgetHostViewAndroid*>(
@@ -113,7 +113,7 @@ void WebContentsViewAndroid::SetContentViewCore(
             ->GetWidget()
             ->GetView());
     if (rwhv)
-      rwhv->SetContentViewCore(content_view_core_);
+      rwhv->UpdateNativeViewTree(&view_);
   }
 }
 
@@ -253,8 +253,9 @@ RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForWidget(
   // order to paint it. See ContentView::GetRenderWidgetHostViewAndroid for an
   // example of how this is achieved for InterstitialPages.
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host);
+  gfx::NativeView native_view = content_view_core_ ? &view_ : nullptr;
   RenderWidgetHostViewAndroid* rwhv =
-      new RenderWidgetHostViewAndroid(rwhi, content_view_core_);
+      new RenderWidgetHostViewAndroid(rwhi, native_view);
   rwhv->SetSynchronousCompositorClient(synchronous_compositor_client_);
   return rwhv;
 }
@@ -262,7 +263,7 @@ RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForWidget(
 RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForPopupWidget(
     RenderWidgetHost* render_widget_host) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host);
-  return new RenderWidgetHostViewAndroid(rwhi, NULL);
+  return new RenderWidgetHostViewAndroid(rwhi, nullptr);
 }
 
 void WebContentsViewAndroid::RenderViewCreated(RenderViewHost* host) {

content/public/android/java/src/org/chromium/content/browser/ContentViewCoreImpl.java

@@ -436,11 +436,6 @@ public class ContentViewCoreImpl implements ContentViewCore, DisplayAndroidObser
         return nativeGetTopControlsShrinkBlinkHeightPixForTesting(mNativeContentViewCore);
     }
 
-    @CalledByNative
-    private void requestDisallowInterceptTouchEvent() {
-        mContainerView.requestDisallowInterceptTouchEvent(true);
-    }
-
     @Override
     public boolean isScrollInProgress() {
         return getSelectionPopupController().getScrollInProgress()

ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java

@@ -333,6 +333,12 @@ public abstract class ViewAndroidDelegate {
         return mTemporaryContainerLocation[1];
     }
 
+    @CalledByNative
+    private void requestDisallowInterceptTouchEvent() {
+        ViewGroup container = getContainerView();
+        if (container != null) container.requestDisallowInterceptTouchEvent(true);
+    }
+
     @CalledByNative
     private boolean hasFocus() {
         ViewGroup containerView = getContainerView();

ui/android/view_android.cc

@@ -277,6 +277,14 @@ void ViewAndroid::RemoveObserver(ViewAndroidObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
+void ViewAndroid::RequestDisallowInterceptTouchEvent() {
+  ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
+  if (delegate.is_null())
+    return;
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_ViewAndroidDelegate_requestDisallowInterceptTouchEvent(env, delegate);
+}
+
 void ViewAndroid::OnAttachedToWindow() {
   for (auto& observer : observer_list_)
     observer.OnAttachedToWindow();

ui/android/view_android.h

@@ -167,6 +167,10 @@ class UI_ANDROID_EXPORT ViewAndroid {
   void AddObserver(ViewAndroidObserver* observer);
   void RemoveObserver(ViewAndroidObserver* observer);
 
+  void RequestDisallowInterceptTouchEvent();
+
+  ViewAndroid* parent() const { return parent_; }
+
  protected:
   ViewAndroid* parent_;