Android: Extend ViewAndroid

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 194 matching lines @@
 ContentViewCore* ContentViewCore::GetNativeContentViewCore(JNIEnv* env,
                                                            jobject obj) {
   return reinterpret_cast<ContentViewCore*>(
       Java_ContentViewCore_getNativeContentViewCore(env, obj));
 }
 
 ContentViewCoreImpl::ContentViewCoreImpl(
     JNIEnv* env,
     jobject obj,
     WebContents* web_contents,
-    jobject view_android_delegate,
+    const base::android::JavaRef<jobject>& view_android_delegate,
     ui::WindowAndroid* window_android,
     jobject java_bridge_retained_object_set)
     : WebContentsObserver(web_contents),
       java_ref_(env, obj),
+      view_android_(view_android_delegate, window_android),
       web_contents_(static_cast<WebContentsImpl*>(web_contents)),
-      root_layer_(cc::SolidColorLayer::Create()),
       page_scale_(1),
-      dpi_scale_(ui::GetScaleFactorForNativeView(this)),
-      window_android_(window_android),
+      dpi_scale_(ui::GetScaleFactorForNativeView(&view_android_)),
       device_orientation_(0),
       accessibility_enabled_(false) {
   CHECK(web_contents) <<
       "A ContentViewCoreImpl should be created with a valid WebContents.";
-  DCHECK(window_android_);
-  DCHECK(view_android_delegate);
-  view_android_delegate_.Reset(AttachCurrentThread(), view_android_delegate);
-  root_layer_->SetBackgroundColor(GetBackgroundColor(env, obj));
+  DCHECK(window_android);
+  DCHECK(!view_android_delegate.is_null());
+  view_android_.SetLayer(cc::SolidColorLayer::Create());
+  view_android_.GetLayer()->SetBackgroundColor(GetBackgroundColor(env, obj));
   gfx::Size physical_size(
       Java_ContentViewCore_getPhysicalBackingWidthPix(env, obj),
       Java_ContentViewCore_getPhysicalBackingHeightPix(env, obj));
-  root_layer_->SetBounds(physical_size);
-  root_layer_->SetIsDrawable(true);
+  view_android_.GetLayer()->SetBounds(physical_size);
+  view_android_.GetLayer()->SetIsDrawable(true);
 
   // 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);
 
   java_bridge_dispatcher_host_ =
       new GinJavaBridgeDispatcherHost(web_contents,
                                       java_bridge_retained_object_set);
 
   InitWebContents();
 }
 
 void ContentViewCoreImpl::AddObserver(
     ContentViewCoreImplObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void ContentViewCoreImpl::RemoveObserver(
     ContentViewCoreImplObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 ContentViewCoreImpl::~ContentViewCoreImpl() {
-  root_layer_->RemoveFromParent();
+  view_android_.GetLayer()->RemoveFromParent();
   FOR_EACH_OBSERVER(ContentViewCoreImplObserver,
                     observer_list_,
                     OnContentViewCoreDestroyed());
   observer_list_.Clear();
 
   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.obj(), reinterpret_cast<intptr_t>(this));
   }
 }
 
 void ContentViewCoreImpl::UpdateWindowAndroid(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj,
     jlong window_android) {
   if (window_android) {
-    DCHECK(!window_android_);
-    window_android_ = reinterpret_cast<ui::WindowAndroid*>(window_android);
+    DCHECK(!view_android_.GetWindowAndroid());
+    view_android_.SetWindowAndroid(
+        reinterpret_cast<ui::WindowAndroid*>(window_android));
     FOR_EACH_OBSERVER(ContentViewCoreImplObserver,
                       observer_list_,
                       OnAttachedToWindow());
   } else {
     FOR_EACH_OBSERVER(ContentViewCoreImplObserver,
                       observer_list_,
                       OnDetachedFromWindow());
-    window_android_ = NULL;
+    view_android_.SetWindowAndroid(nullptr);
   }
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 ContentViewCoreImpl::GetWebContentsAndroid(JNIEnv* env,
                                            const JavaParamRef<jobject>& obj) {
   return web_contents_->GetJavaWebContents();
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 ContentViewCoreImpl::GetJavaWindowAndroid(JNIEnv* env,
                                           const JavaParamRef<jobject>& obj) {
-  if (!window_android_)
+  if (!view_android_.GetWindowAndroid())
     return ScopedJavaLocalRef<jobject>();
-  return window_android_->GetJavaObject();
+  return view_android_.GetWindowAndroid()->GetJavaObject();
 }
 
 void ContentViewCoreImpl::OnJavaContentViewCoreDestroyed(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   DCHECK(env->IsSameObject(java_ref_.get(env).obj(), obj));
   java_ref_.reset();
   // Java peer has gone, ContentViewCore is not functional and waits to
   // be destroyed with WebContents.
   // We need to reset WebContentsViewAndroid's reference, otherwise, there
@@ skipping 100 matching lines @@
     float page_scale_factor,
     const gfx::Vector2dF& page_scale_factor_limits,
     const gfx::SizeF& content_size,
     const gfx::SizeF& viewport_size,
     const gfx::Vector2dF& controls_offset,
     const gfx::Vector2dF& content_offset,
     bool is_mobile_optimized_hint,
     const gfx::SelectionBound& selection_start) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
-  if (obj.is_null() || !window_android_)
+  if (obj.is_null() || !view_android_.GetWindowAndroid())
     return;
 
-  window_android_->set_content_offset(
+  view_android_.GetWindowAndroid()->set_content_offset(
       gfx::ScaleVector2d(content_offset, dpi_scale_));
 
   page_scale_ = page_scale_factor;
 
   // The CursorAnchorInfo API in Android only supports zero width selection
   // bounds.
   const jboolean has_insertion_marker =
       selection_start.type() == gfx::SelectionBound::CENTER;
   const jboolean is_insertion_marker_visible = selection_start.visible();
   const jfloat insertion_marker_horizontal =
@@ skipping 28 matching lines @@
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   ScopedJavaLocalRef<jstring> jtitle =
       ConvertUTF8ToJavaString(env, base::UTF16ToUTF8(title));
   Java_ContentViewCore_setTitle(env, obj.obj(), jtitle.obj());
 }
 
 void ContentViewCoreImpl::OnBackgroundColorChanged(SkColor color) {
-  root_layer_->SetBackgroundColor(color);
+  view_android_.GetLayer()->SetBackgroundColor(color);
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_ContentViewCore_onBackgroundColorChanged(env, obj.obj(), color);
 }
 
 void ContentViewCoreImpl::ShowSelectPopupMenu(
     RenderFrameHost* frame,
@@ skipping 329 matching lines @@
   if (j_obj.is_null())
     return false;
   return Java_ContentViewCore_doTopControlsShrinkBlinkSize(env, j_obj.obj());
 }
 
 float ContentViewCoreImpl::GetTopControlsHeightDip() const {
   return GetTopControlsHeightPix() / dpi_scale();
 }
 
 void ContentViewCoreImpl::AttachLayer(scoped_refptr<cc::Layer> layer) {
-  root_layer_->InsertChild(layer, 0);
-  root_layer_->SetIsDrawable(false);
+  view_android_.GetLayer()->InsertChild(layer, 0);
+  view_android_.GetLayer()->SetIsDrawable(false);
 }
 
 void ContentViewCoreImpl::RemoveLayer(scoped_refptr<cc::Layer> layer) {
   layer->RemoveFromParent();
 
-  if (root_layer_->children().empty())
-    root_layer_->SetIsDrawable(true);
+  if (!view_android_.GetLayer()->children().empty())
+    view_android_.GetLayer()->SetIsDrawable(true);
 }
 
 void ContentViewCoreImpl::MoveRangeSelectionExtent(const gfx::PointF& extent) {
   if (!web_contents_)
     return;
 
   web_contents_->MoveRangeSelectionExtent(gfx::ToRoundedPoint(extent));
 }
 
 void ContentViewCoreImpl::SelectBetweenCoordinates(const gfx::PointF& base,
                                                    const gfx::PointF& extent) {
   if (!web_contents_)
     return;
 
   gfx::Point base_point = gfx::ToRoundedPoint(base);
   gfx::Point extent_point = gfx::ToRoundedPoint(extent);
   if (base_point == extent_point)
     return;
 
   web_contents_->SelectRange(base_point, extent_point);
 }
 
-ScopedJavaLocalRef<jobject> ContentViewCoreImpl::GetViewAndroidDelegate()
-    const {
-  return base::android::ScopedJavaLocalRef<jobject>(view_android_delegate_);
+const base::android::JavaRef<jobject>&
+ContentViewCoreImpl::GetViewAndroidDelegate() const {
+  return view_android_.GetViewAndroidDelegate();
 }
 
 ui::WindowAndroid* ContentViewCoreImpl::GetWindowAndroid() const {
-  return window_android_;
+  return view_android_.GetWindowAndroid();
 }
 
-const scoped_refptr<cc::Layer>& ContentViewCoreImpl::GetLayer() const {
-  return root_layer_;
+cc::Layer* ContentViewCoreImpl::GetLayer() const {
+  return view_android_.GetLayer();

[Yusuf, 2016/07/08 23:06:00]

CVC and RWHVAndroid are both Android specific, we call ViewAndroid view_android_
here view_ in RWHVAndroid. I think having the same name would make things better
readable. No strong feelings about which name.

[no sievers, 2016/07/08 23:24:22]

True. I've made it CVC::view_ since 'android' is a bit verbose in an
Android-only source file.

 }
 
+ui::ViewAndroid* ContentViewCoreImpl::GetViewAndroid() {
+  return &view_android_;
+}
+
+
 // ----------------------------------------------------------------------------
 // Methods called from Java via JNI
 // ----------------------------------------------------------------------------
 
 void ContentViewCoreImpl::SelectPopupMenuItems(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jlong selectPopupSourceFrame,
     const JavaParamRef<jintArray>& indices) {
   RenderFrameHostImpl* rfhi =
@@ skipping 403 matching lines @@
   java_bridge_dispatcher_host_->RemoveNamedObject(
       ConvertJavaStringToUTF8(env, name));
 }
 
 void ContentViewCoreImpl::WasResized(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj) {
   RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid();
   gfx::Size physical_size(
       Java_ContentViewCore_getPhysicalBackingWidthPix(env, obj),
       Java_ContentViewCore_getPhysicalBackingHeightPix(env, obj));
-  root_layer_->SetBounds(physical_size);
+  view_android_.GetLayer()->SetBounds(physical_size);
 
   if (view) {
     web_contents_->SendScreenRects();
     view->WasResized();
   }
 }
 
 long ContentViewCoreImpl::GetNativeImeAdapter(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
@@ skipping 116 matching lines @@
     if (web_contents_) {
       web_contents_->SetAccessibilityMode(
           accessibility_state->accessibility_mode());
     }
   }
 }
 
 void ContentViewCoreImpl::SendOrientationChangeEventInternal() {
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
   if (rwhv)
-    rwhv->UpdateScreenInfo(this);
+    rwhv->UpdateScreenInfo(&view_android_);
 
   static_cast<WebContentsImpl*>(web_contents())->
       screen_orientation_dispatcher_host()->OnOrientationChange();
 }
 
 void ContentViewCoreImpl::ExtractSmartClipData(JNIEnv* env,
                                                const JavaParamRef<jobject>& obj,
                                                jint x,
                                                jint y,
                                                jint width,
@@ skipping 193 matching lines @@
     return ScopedJavaLocalRef<jobject>();
 
   return view->GetJavaObject();
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env) && JNI_DragEvent::RegisterNativesImpl(env);
 }
 
 }  // namespace content