Android: Remove ContentViewCore::GetLayer() from public interface

chrome/browser/android/tab_android.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 "chrome/browser/android/tab_android.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 47 matching lines @@
 #include "components/favicon/content/content_favicon_driver.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "components/navigation_interception/navigation_params.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_item.h"
 #include "components/offline_pages/offline_page_model.h"
 #include "components/sessions/content/content_live_tab.h"
 #include "components/sessions/core/tab_restore_service.h"
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/android/compositor.h"
-#include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/resource_request_body.h"
 #include "content/public/common/top_controls_state.h"
 #include "jni/Tab_jni.h"
 #include "net/base/escape.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
+#include "ui/android/view_android.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image_skia.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
@@ skipping 71 matching lines @@
   JNIEnv* env = base::android::AttachCurrentThread();
   return GURL(base::android::ConvertJavaStringToUTF8(
       Java_Tab_getUrl(env, weak_java_tab_.get(env).obj())));
 }
 
 bool TabAndroid::LoadIfNeeded() {
   JNIEnv* env = base::android::AttachCurrentThread();
   return Java_Tab_loadIfNeeded(env, weak_java_tab_.get(env).obj());
 }
 
-content::ContentViewCore* TabAndroid::GetContentViewCore() const {
-  if (!web_contents())
-    return NULL;
-
-  return content::ContentViewCore::FromWebContents(web_contents());
-}
-
 Profile* TabAndroid::GetProfile() const {
   if (!web_contents())
     return NULL;
 
   return Profile::FromBrowserContext(web_contents()->GetBrowserContext());
 }
 
 browser_sync::SyncedTabDelegate* TabAndroid::GetSyncedTabDelegate() const {
   return synced_tab_delegate_.get();
 }
@@ skipping 174 matching lines @@
 }
 
 void TabAndroid::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
 void TabAndroid::InitWebContents(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jboolean incognito,
-    const JavaParamRef<jobject>& jcontent_view_core,
+    const JavaParamRef<jobject>& jweb_contents,
     const JavaParamRef<jobject>& jweb_contents_delegate,
     const JavaParamRef<jobject>& jcontext_menu_populator) {
-  content::ContentViewCore* content_view_core =
-      content::ContentViewCore::GetNativeContentViewCore(env,
-                                                         jcontent_view_core);
-  DCHECK(content_view_core);
-  DCHECK(content_view_core->GetWebContents());
+  web_contents_.reset(
+      content::WebContents::FromJavaWebContents(jweb_contents.obj()));
+  DCHECK(web_contents_.get());
 
-  web_contents_.reset(content_view_core->GetWebContents());
   AttachTabHelpers(web_contents_.get());
 
   SetWindowSessionID(session_window_id_.id());
 
   session_tab_id_.set_id(
       SessionTabHelper::FromWebContents(web_contents())->session_id().id());
   ContextMenuHelper::FromWebContents(web_contents())->SetPopulator(
       jcontext_menu_populator);
   ViewAndroidHelper::FromWebContents(web_contents())->
       SetViewAndroid(web_contents()->GetNativeView());
@@ skipping 25 matching lines @@
 
   // Verify that the WebContents this tab represents matches the expected
   // off the record state.
   CHECK_EQ(GetProfile()->IsOffTheRecord(), incognito);
 
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(GetProfile());
   if (instant_service)
     instant_service->AddObserver(this);
 
-  content_layer_->InsertChild(content_view_core->GetLayer(), 0);
+  content_layer_->InsertChild(web_contents_->GetNativeView()->GetLayer(), 0);
 }
 
 void TabAndroid::UpdateDelegates(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& jweb_contents_delegate,
     const JavaParamRef<jobject>& jcontext_menu_populator) {
   ContextMenuHelper::FromWebContents(web_contents())->SetPopulator(
       jcontext_menu_populator);
   web_contents_delegate_.reset(
       new chrome::android::TabWebContentsDelegateAndroid(
           env, jweb_contents_delegate));
   web_contents()->SetDelegate(web_contents_delegate_.get());
 }
 
 void TabAndroid::DestroyWebContents(JNIEnv* env,
                                     const JavaParamRef<jobject>& obj,
                                     jboolean delete_native) {
   DCHECK(web_contents());
 
-  content::ContentViewCore* content_view_core = GetContentViewCore();
-  if (content_view_core)
-    content_view_core->GetLayer()->RemoveFromParent();
+  if (web_contents()->GetNativeView())
+    web_contents()->GetNativeView()->GetLayer()->RemoveFromParent();
 
   notification_registrar_.Remove(
       this,
       chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED,
       content::Source<content::WebContents>(web_contents()));
   notification_registrar_.Remove(
       this,
       content::NOTIFICATION_NAV_ENTRY_CHANGED,
       content::Source<content::NavigationController>(
            &web_contents()->GetController()));
@@ skipping 402 matching lines @@
   if (tab_content_manager == tab_content_manager_)
     return;
 
   if (tab_content_manager_)
     tab_content_manager_->DetachLiveLayer(GetAndroidId(), GetContentLayer());
   tab_content_manager_ = tab_content_manager;
   if (tab_content_manager_)
     tab_content_manager_->AttachLiveLayer(GetAndroidId(), GetContentLayer());
 }
 
-void TabAndroid::AttachOverlayContentViewCore(
+void TabAndroid::AttachOverlayWebContents(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    const JavaParamRef<jobject>& jcontent_view_core,
+    const JavaParamRef<jobject>& jweb_contents,
     jboolean visible) {
-  content::ContentViewCore* content_view_core =
-      content::ContentViewCore::GetNativeContentViewCore(env,
-                                                         jcontent_view_core);
-  DCHECK(content_view_core);
+  WebContents* web_contents =
+      content::WebContents::FromJavaWebContents(jweb_contents.obj());
+  DCHECK(web_contents);
+  DCHECK(web_contents->GetNativeView());
 
-  content_view_core->GetLayer()->SetHideLayerAndSubtree(!visible);
-  content_layer_->AddChild(content_view_core->GetLayer());
+  web_contents->GetNativeView()->GetLayer()->SetHideLayerAndSubtree(!visible);
+  content_layer_->AddChild(web_contents->GetNativeView()->GetLayer());
 }
 
-void TabAndroid::DetachOverlayContentViewCore(
+void TabAndroid::DetachOverlayWebContents(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    const JavaParamRef<jobject>& jcontent_view_core) {
-  content::ContentViewCore* content_view_core =
-      content::ContentViewCore::GetNativeContentViewCore(env,
-                                                         jcontent_view_core);
-  DCHECK(content_view_core);
+    const JavaParamRef<jobject>& jweb_contents) {
+  WebContents* web_contents =
+      content::WebContents::FromJavaWebContents(jweb_contents.obj());
+  DCHECK(web_contents);
+  DCHECK(web_contents->GetNativeView());
 
-  if (content_view_core->GetLayer()->parent() == content_layer_)
-    content_view_core->GetLayer()->RemoveFromParent();
+  if (web_contents->GetNativeView()->GetLayer()->parent() == content_layer_)
+    web_contents->GetNativeView()->GetLayer()->RemoveFromParent();
 }
 
 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   TRACE_EVENT0("native", "TabAndroid::Init");
   // This will automatically bind to the Java object and pass ownership there.
   new TabAndroid(env, obj);
 }
 
 // static
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }