Make ViewRoot the top of the ViewAndroid tree

chrome/browser/android/compositor/compositor_view.cc

 // Copyright 2015 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 "chrome/browser/android/compositor/compositor_view.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 
 #include <memory>
@@ skipping 26 matching lines @@
 #include "ui/android/window_android.h"
 #include "ui/gfx/android/java_bitmap.h"
 
 using base::android::JavaParamRef;
 
 namespace android {
 
 jlong Init(JNIEnv* env,
            const JavaParamRef<jobject>& obj,
            jboolean low_mem_device,
-           jlong native_window_android,
+           jlong native_view_root,
            const JavaParamRef<jobject>& jlayer_title_cache,
            const JavaParamRef<jobject>& jtab_content_manager) {
   CompositorView* view;
-  ui::WindowAndroid* window_android =
-      reinterpret_cast<ui::WindowAndroid*>(native_window_android);
+  ui::ViewRoot* view_root = reinterpret_cast<ui::ViewRoot*>(native_view_root);
   LayerTitleCache* layer_title_cache =
       LayerTitleCache::FromJavaObject(jlayer_title_cache);
   TabContentManager* tab_content_manager =
       TabContentManager::FromJavaObject(jtab_content_manager);
 
   DCHECK(tab_content_manager);
 
   // TODO(clholgat): Remove the compositor tabstrip flag.
-  view = new CompositorView(env, obj, low_mem_device, window_android,
+  view = new CompositorView(env, obj, low_mem_device, view_root,
                             tab_content_manager);
 
   ui::UIResourceProvider* ui_resource_provider = view->GetUIResourceProvider();
   // TODO(dtrainor): Pass the ResourceManager on the Java side to the tree
   // builders instead.
   if (layer_title_cache)
     layer_title_cache->SetResourceManager(view->GetResourceManager());
   if (tab_content_manager)
     tab_content_manager->SetUIResourceProvider(ui_resource_provider);
 
   return reinterpret_cast<intptr_t>(view);
 }
 
 CompositorView::CompositorView(JNIEnv* env,
                                jobject obj,
                                jboolean low_mem_device,
-                               ui::WindowAndroid* window_android,
+                               ui::ViewRoot* view_root,
                                TabContentManager* tab_content_manager)
     : tab_content_manager_(tab_content_manager),
       root_layer_(cc::SolidColorLayer::Create()),
       scene_layer_(nullptr),
       current_surface_format_(0),
       content_width_(0),
       content_height_(0),
       overlay_video_mode_(false),
       weak_factory_(this) {
   content::BrowserChildProcessObserver::Add(this);
   obj_.Reset(env, obj);
-  compositor_.reset(content::Compositor::Create(this, window_android));
+  compositor_.reset(content::Compositor::Create(this, view_root));
 
   root_layer_->SetIsDrawable(true);
   root_layer_->SetBackgroundColor(SK_ColorWHITE);
 }
 
 CompositorView::~CompositorView() {
   content::BrowserChildProcessObserver::Remove(this);
   tab_content_manager_->OnUIResourcesWereEvicted();
 
   // Explicitly reset these scoped_ptrs here because otherwise we callbacks will
@@ skipping 152 matching lines @@
   // The Android TERMINATION_STATUS_OOM_PROTECTED hack causes us to never go
   // through here but through BrowserChildProcessHostDisconnected() instead.
 }
 
 // Register native methods
 bool RegisterCompositorView(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android