Make ViewRoot the top of the ViewAndroid tree

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 36 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/menu_item.h"
 #include "content/public/common/user_agent.h"
 #include "device/geolocation/geolocation_service_context.h"
 #include "jni/ContentViewCore_jni.h"
 #include "jni/DragEvent_jni.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "ui/android/view_android.h"
+#include "ui/android/view_root.h"
 #include "ui/android/window_android.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/events/android/motion_event_android.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/blink/web_input_event_traits.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gesture_detection/motion_event.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/geometry/point_conversions.h"
@@ skipping 155 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 21 matching lines @@
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   java_ref_.reset();
   if (!j_obj.is_null()) {
     Java_ContentViewCore_onNativeContentViewCoreDestroyed(
         env, j_obj, reinterpret_cast<intptr_t>(this));
   }
 }
 
-void ContentViewCoreImpl::UpdateWindowAndroid(
+void ContentViewCoreImpl::UpdateViewRoot(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj,
-    jlong window_android) {
+    jlong view_root_ptr) {
+  ui::ViewRoot* view_root = reinterpret_cast<ui::ViewRoot*>(view_root_ptr);
   ui::ViewAndroid* view = GetViewAndroid();
-  ui::WindowAndroid* window =
-      reinterpret_cast<ui::WindowAndroid*>(window_android);
-  if (window == GetWindowAndroid())
+  if (view_root == view->GetViewRoot())
     return;
-  if (GetWindowAndroid()) {
+  if (view->GetViewRoot()) {
     for (auto& observer : observer_list_)
       observer.OnDetachedFromWindow();
     view->RemoveFromParent();
   }
-  if (window) {
-    window->AddChild(view);
+  if (view_root) {
+    view_root->AddChild(view);
     for (auto& observer : observer_list_)
       observer.OnAttachedToWindow();
   }
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 ContentViewCoreImpl::GetWebContentsAndroid(JNIEnv* env,
                                            const JavaParamRef<jobject>& obj) {
   return web_contents_->GetJavaWebContents();
 }
@@ skipping 937 matching lines @@
       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);
 
+  gfx::Size view_size(GetViewSize());
+  GetViewAndroid()->SetLayout(0, 0, view_size.width(), view_size.height(),
+                              false);
+
   SendScreenRectsAndResizeWidget();
 }
 
 long ContentViewCoreImpl::GetNativeImeAdapter(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   RenderWidgetHostViewAndroid* rwhva = GetRenderWidgetHostViewAndroid();
   if (!rwhva)
     return 0;
   return rwhva->GetNativeImeAdapter();
@@ skipping 225 matching lines @@
       static_cast<WebContentsImpl*>(web_contents())->GetView());
   DCHECK(wcva);
   wcva->SetContentViewCore(NULL);
 }
 
 // This is called for each ContentView.
 jlong Init(JNIEnv* env,
            const JavaParamRef<jobject>& obj,
            const JavaParamRef<jobject>& jweb_contents,
            const JavaParamRef<jobject>& jview_android_delegate,
-           jlong jwindow_android,
+           jlong jview_root_ptr,
            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());
+  gfx::Size physical_size(
+      Java_ContentViewCore_getPhysicalBackingWidthPix(env, obj),
+      Java_ContentViewCore_getPhysicalBackingHeightPix(env, obj));
+  view_android->GetLayer()->SetBounds(physical_size);
 
-  ui::WindowAndroid* window_android =
-        reinterpret_cast<ui::WindowAndroid*>(jwindow_android);
-  DCHECK(window_android);
-  window_android->AddChild(view_android);
+  ui::ViewRoot* view_root = reinterpret_cast<ui::ViewRoot*>(jview_root_ptr);
+  DCHECK(view_root->GetWindowAndroid());
+  view_root->AddChild(view_android);
 
   // TODO: pass dipScale.
   ContentViewCoreImpl* view = new ContentViewCoreImpl(
       env, obj, web_contents, dipScale, retained_objects_set);
   return reinterpret_cast<intptr_t>(view);
 }
 
 static ScopedJavaLocalRef<jobject> FromWebContentsAndroid(
     JNIEnv* env,
     const JavaParamRef<jclass>& clazz,
     const JavaParamRef<jobject>& jweb_contents) {
   WebContents* web_contents = WebContents::FromJavaWebContents(jweb_contents);
   if (!web_contents)
     return ScopedJavaLocalRef<jobject>();
 
   ContentViewCore* view = ContentViewCore::FromWebContents(web_contents);
   if (!view)
     return ScopedJavaLocalRef<jobject>();
 
   return view->GetJavaObject();
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content