Make ViewRoot the top of the ViewAndroid tree

content/browser/android/content_view_render_view.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/android/content_view_render_view.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 
 #include <memory>
@@ skipping 18 matching lines @@
 
 namespace content {
 
 // static
 bool ContentViewRenderView::RegisterContentViewRenderView(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 ContentViewRenderView::ContentViewRenderView(JNIEnv* env,
                                              jobject obj,
-                                             gfx::NativeWindow root_window)
-    : root_window_(root_window), current_surface_format_(0) {
+                                             ui::ViewRoot* view_root)
+    : view_root_(view_root), current_surface_format_(0) {
   java_obj_.Reset(env, obj);
 }
 
 ContentViewRenderView::~ContentViewRenderView() {
 }
 
 // static
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
-                  jlong native_root_window) {
-  gfx::NativeWindow root_window =
-      reinterpret_cast<gfx::NativeWindow>(native_root_window);
+                  jlong native_view_root) {
+  ui::ViewRoot* view_root = reinterpret_cast<ui::ViewRoot*>(native_view_root);
   ContentViewRenderView* content_view_render_view =
-      new ContentViewRenderView(env, obj, root_window);
+      new ContentViewRenderView(env, obj, view_root);
   return reinterpret_cast<intptr_t>(content_view_render_view);
 }
 
 void ContentViewRenderView::Destroy(JNIEnv* env,
                                     const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
 void ContentViewRenderView::SetCurrentWebContents(
     JNIEnv* env,
@@ skipping 45 matching lines @@
   // Compositor related classes.
 }
 
 void ContentViewRenderView::OnSwapBuffersCompleted(int pending_swap_buffers) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_ContentViewRenderView_onSwapBuffersCompleted(env, java_obj_);
 }
 
 void ContentViewRenderView::InitCompositor() {
   if (!compositor_)
-    compositor_.reset(Compositor::Create(this, root_window_));
+    compositor_.reset(Compositor::Create(this, view_root_));
 }
 
 }  // namespace content