Introduce ViewRoot to forward input/view events to native

content/browser/android/content_view_core_impl.cc

 // Copyright 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/android/content_view_core_impl.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 199 matching lines @@
     WebContents* web_contents,
     float dpi_scale,
     const JavaRef<jobject>& java_bridge_retained_object_set)
     : WebContentsObserver(web_contents),
       java_ref_(env, obj),
       web_contents_(static_cast<WebContentsImpl*>(web_contents)),
       page_scale_(1),
       dpi_scale_(dpi_scale),
       device_orientation_(0),
       accessibility_enabled_(false) {
-  GetViewAndroid()->SetLayer(cc::Layer::Create());
-  gfx::Size physical_size(
-      Java_ContentViewCore_getPhysicalBackingWidthPix(env, obj),
-      Java_ContentViewCore_getPhysicalBackingHeightPix(env, obj));
-  GetViewAndroid()->GetLayer()->SetBounds(physical_size);
-
   // Currently, the only use case we have for overriding a user agent involves
   // spoofing a desktop Linux user agent for "Request desktop site".
   // Automatically set it for all WebContents so that it is available when a
   // NavigationEntry requires the user agent to be overridden.
   const char kLinuxInfoStr[] = "X11; Linux x86_64";
   std::string product = content::GetContentClient()->GetProduct();
   std::string spoofed_ua =
       BuildUserAgentFromOSAndProduct(kLinuxInfoStr, product);
   web_contents->SetUserAgentOverride(spoofed_ua);
 
@@ skipping 479 matching lines @@
   return size_dip;
 }
 
 gfx::Size ContentViewCoreImpl::GetViewSize() const {
   gfx::Size size = GetViewportSizeDip();
   if (DoBrowserControlsShrinkBlinkSize())
     size.Enlarge(0, -GetTopControlsHeightDip() - GetBottomControlsHeightDip());
   return size;
 }
 
-gfx::Size ContentViewCoreImpl::GetPhysicalBackingSize() const {
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
-  if (j_obj.is_null())
-    return gfx::Size();
-  return gfx::Size(
-      Java_ContentViewCore_getPhysicalBackingWidthPix(env, j_obj),
-      Java_ContentViewCore_getPhysicalBackingHeightPix(env, j_obj));
-}
-
 gfx::Size ContentViewCoreImpl::GetViewportSizePix() const {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (j_obj.is_null())
     return gfx::Size();
   return gfx::Size(Java_ContentViewCore_getViewportWidthPix(env, j_obj),
                    Java_ContentViewCore_getViewportHeightPix(env, j_obj));
 }
 
 int ContentViewCoreImpl::GetTopControlsHeightPix() const {
@@ skipping 498 matching lines @@
 void ContentViewCoreImpl::RemoveJavascriptInterface(
     JNIEnv* env,
     const JavaParamRef<jobject>& /* obj */,
     const JavaParamRef<jstring>& name) {
   java_bridge_dispatcher_host_->RemoveNamedObject(
       ConvertJavaStringToUTF8(env, name));
 }
 
 void ContentViewCoreImpl::WasResized(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj) {
-  gfx::Size physical_size(
-      Java_ContentViewCore_getPhysicalBackingWidthPix(env, obj),
-      Java_ContentViewCore_getPhysicalBackingHeightPix(env, obj));
-  GetViewAndroid()->GetLayer()->SetBounds(physical_size);
-
+  GetViewAndroid()->UpdateLayerBounds();

[boliu, 2016/12/06 23:15:45]

hmm, why is this still needed? did physical bounds didn't actually change here?

[Jinsuk Kim, 2016/12/07 12:36:28]

Removed.

   SendScreenRectsAndResizeWidget();
 }
 
 long ContentViewCoreImpl::GetNativeImeAdapter(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   RenderWidgetHostViewAndroid* rwhva = GetRenderWidgetHostViewAndroid();
   if (!rwhva)
     return 0;
   return rwhva->GetNativeImeAdapter();
@@ skipping 299 matching lines @@
            const JavaParamRef<jobject>& jview_android_delegate,
            jlong jwindow_android,
            jfloat dipScale,
            const JavaParamRef<jobject>& retained_objects_set) {
   WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
       WebContents::FromJavaWebContents(jweb_contents));
   CHECK(web_contents) <<
       "A ContentViewCoreImpl should be created with a valid WebContents.";
   ui::ViewAndroid* view_android = web_contents->GetView()->GetNativeView();
   view_android->SetDelegate(jview_android_delegate);
+  view_android->SetLayer(cc::Layer::Create());

[boliu, 2016/12/06 23:15:45]

is this to avoid null checks in ViewAndroid for updating size?

if ViewAndroid has a null layer pointer, then it should just skip updating the
layer

[Jinsuk Kim, 2016/12/07 12:36:28]

Yes, also the line now looked like an odd one out after the physical backing
size update in the ctr is removed. Wanted to place calls on view android all
here.

Guarded layer bound update with null check too.

 
   ui::WindowAndroid* window_android =
         reinterpret_cast<ui::WindowAndroid*>(jwindow_android);
   DCHECK(window_android);
   window_android->AddChild(view_android);
 
   // TODO: pass dipScale.
   ContentViewCoreImpl* view = new ContentViewCoreImpl(
       env, obj, web_contents, dipScale, retained_objects_set);
   return reinterpret_cast<intptr_t>(view);
@@ skipping 12 matching lines @@
     return ScopedJavaLocalRef<jobject>();
 
   return view->GetJavaObject();
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content