android_webview: Let AwContents manage TouchHandleDrawable

android_webview/native/popup_touch_handle_drawable.cc

-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2016 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/popup_touch_handle_drawable.h"
+#include "android_webview/native/popup_touch_handle_drawable.h"
 
-#include "content/public/browser/android/content_view_core.h"
 #include "jni/PopupTouchHandleDrawable_jni.h"
 
+using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
-namespace content {
+namespace android_webview {
 
-// static
-std::unique_ptr<PopupTouchHandleDrawable> PopupTouchHandleDrawable::Create(
-    ContentViewCore* content_view_core,
-    float dpi_scale) {
-  DCHECK(content_view_core);
-  base::android::ScopedJavaLocalRef<jobject> content_view_core_obj =
-      content_view_core->GetJavaObject();
-  if (content_view_core_obj.is_null())
-    return nullptr;
-  JNIEnv* env = base::android::AttachCurrentThread();
-  base::android::ScopedJavaLocalRef<jobject> drawable_obj(
-      Java_PopupTouchHandleDrawable_create(env, content_view_core_obj));
-  return std::unique_ptr<PopupTouchHandleDrawable>(
-      new PopupTouchHandleDrawable(env, drawable_obj.obj(), dpi_scale));
-}
-
-PopupTouchHandleDrawable::PopupTouchHandleDrawable(JNIEnv* env,
-                                                   jobject obj,
-                                                   float dpi_scale)
-    : java_ref_(env, obj), dpi_scale_(dpi_scale) {
+PopupTouchHandleDrawable::PopupTouchHandleDrawable(
+    JNIEnv* env,
+    jobject obj,
+    float dip_scale,
+    float horizontal_padding_ratio)
+    : java_ref_(env, obj)
+    , dip_scale_(dip_scale)
+    , drawable_horizontal_padding_ratio_(horizontal_padding_ratio) {
   DCHECK(!java_ref_.is_empty());
-  drawable_horizontal_padding_ratio_ =
-      Java_PopupTouchHandleDrawable_getHandleHorizontalPaddingRatio(env, obj);
 }
 
 PopupTouchHandleDrawable::~PopupTouchHandleDrawable() {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (!obj.is_null())
     Java_PopupTouchHandleDrawable_destroy(env, obj);
 }
 
 void PopupTouchHandleDrawable::SetEnabled(bool enabled) {
@@ skipping 17 matching lines @@
     Java_PopupTouchHandleDrawable_setOrientation(
         env, obj, static_cast<int>(orientation), mirror_vertical,
         mirror_horizontal);
   }
 }
 
 void PopupTouchHandleDrawable::SetOrigin(const gfx::PointF& origin) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (!obj.is_null()) {
-    const gfx::PointF origin_pix = gfx::ScalePoint(origin, dpi_scale_);
+    const gfx::PointF origin_pix = gfx::ScalePoint(origin, dip_scale_);
     Java_PopupTouchHandleDrawable_setOrigin(env, obj, origin_pix.x(),
                                             origin_pix.y());
   }
 }
 
 void PopupTouchHandleDrawable::SetAlpha(float alpha) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   bool visible = alpha > 0;
   if (!obj.is_null())
     Java_PopupTouchHandleDrawable_setVisible(env, obj, visible);
 }
 
 gfx::RectF PopupTouchHandleDrawable::GetVisibleBounds() const {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return gfx::RectF();
   gfx::RectF unscaled_rect(
       Java_PopupTouchHandleDrawable_getPositionX(env, obj),
       Java_PopupTouchHandleDrawable_getPositionY(env, obj),
       Java_PopupTouchHandleDrawable_getVisibleWidth(env, obj),
       Java_PopupTouchHandleDrawable_getVisibleHeight(env, obj));
-  return gfx::ScaleRect(unscaled_rect, 1.f / dpi_scale_);
+  return gfx::ScaleRect(unscaled_rect, 1.f / dip_scale_);
 }
 
 float PopupTouchHandleDrawable::GetDrawableHorizontalPaddingRatio() const {
   return drawable_horizontal_padding_ratio_;
 }
 
+static jlong Init(JNIEnv* env,
+                  const JavaParamRef<jobject>& obj,
+                  const JavaParamRef<jobject>& content_view_core,
+                  const jfloat dip_scale,
+                  const jfloat horizontal_padding_ratio) {
+  if (!content_view_core.obj())

[boliu, 2016/08/26 04:15:45]

can we move this check to java side? which means java side should use a static
create method rather than a constructor, so it can return null as well

[Jinsuk Kim, 2016/08/26 09:21:19]

Done.

+    return 0;
+  return reinterpret_cast<intptr_t>(
+      new PopupTouchHandleDrawable(env, obj, dip_scale,
+          horizontal_padding_ratio));
+}

[boliu, 2016/08/26 04:15:45]

blank line after

[Jinsuk Kim, 2016/08/26 09:21:19]

Done.

 }  // namespace content