android_webview: Let AwContents manage TouchHandleDrawable

android_webview/native/aw_contents.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 "android_webview/native/aw_contents.h"
 
 #include <limits>
 #include <utility>
 
 #include "android_webview/browser/aw_browser_context.h"
@@ skipping 16 matching lines @@
 #include "android_webview/native/aw_contents_lifecycle_notifier.h"
 #include "android_webview/native/aw_gl_functor.h"
 #include "android_webview/native/aw_message_port_service_impl.h"
 #include "android_webview/native/aw_pdf_exporter.h"
 #include "android_webview/native/aw_picture.h"
 #include "android_webview/native/aw_web_contents_delegate.h"
 #include "android_webview/native/java_browser_view_renderer_helper.h"
 #include "android_webview/native/permission/aw_permission_request.h"
 #include "android_webview/native/permission/permission_request_handler.h"
 #include "android_webview/native/permission/simple_permission_request.h"
+#include "android_webview/native/popup_touch_handle_drawable.h"
 #include "android_webview/native/state_serializer.h"
 #include "android_webview/public/browser/draw_gl.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/locale_utils.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/atomicops.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 1006 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_AwContents_didOverscroll(env, obj, overscroll_delta.x(),
                                 overscroll_delta.y(), overscroll_velocity.x(),
                                 overscroll_velocity.y());
 }
 
+ui::TouchHandleDrawable* AwContents::CreateDrawable(float dip_scale) {
+  JNIEnv* env = AttachCurrentThread();
+  auto obj = java_ref_.get(env);

[boliu, 2016/08/24 23:35:30]

don't use auto, jni types are scary, but not that long to type

[Jinsuk Kim, 2016/08/25 07:32:21]

Done.

+  if (obj.is_null())
+    return nullptr;
+  auto cvc = ContentViewCore::FromWebContents(web_contents_.get());

[boliu, 2016/08/24 23:35:30]

ditto here and below, imo auto is making things harder to read, not easier

[Jinsuk Kim, 2016/08/25 07:32:21]

Done.

+  DCHECK(cvc);
+  auto drawable = PopupTouchHandleDrawable::Create(cvc, dip_scale);

[boliu, 2016/08/24 23:35:30]

if gc runs between this line and the line below, then this would break

[Jinsuk Kim, 2016/08/25 07:32:21]

Oops did it again.... Done.

+  auto drawable_obj = drawable->GetJavaObj().get(env);
+  if (!drawable_obj.is_null())
+      Java_AwContents_onCreatedTouchHandle(env, obj, drawable_obj);
+  return drawable.release();
+}
+
 void AwContents::SetDipScale(JNIEnv* env,
                              const JavaParamRef<jobject>& obj,
                              jfloat dip_scale) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   SetDipScaleInternal(dip_scale);
 }
 
 void AwContents::SetDipScaleInternal(float dip_scale) {
   browser_view_renderer_.SetDipScale(dip_scale);
 }
@@ skipping 212 matching lines @@
   int routing_id = new_host->GetRoutingID();
   // At this point, the current RVH may or may not contain a compositor. So
   // compositor_ may be nullptr, in which case
   // BrowserViewRenderer::DidInitializeCompositor() callback is time when the
   // new compositor is constructed.
   browser_view_renderer_.SetActiveCompositorID(
       CompositorID(process_id, routing_id));
 }
 
 }  // namespace android_webview