[Android] Composited selection handle rendering

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 "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/output/begin_frame_args.h"
 #include "content/browser/android/gesture_event_type.h"
 #include "content/browser/android/interstitial_page_delegate_android.h"
 #include "content/browser/android/java/java_bound_object.h"
 #include "content/browser/android/java/java_bridge_dispatcher_host_manager.h"
 #include "content/browser/android/load_url_params.h"
+#include "content/browser/android/popup_touch_handle_drawable.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/geolocation/geolocation_dispatcher_host.h"
 #include "content/browser/media/media_web_contents_observer.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/renderer_host/input/motion_event_android.h"
 #include "content/browser/renderer_host/input/web_input_event_builders_android.h"
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ skipping 509 matching lines @@
       Java_ContentViewCore_onPinchEndEventAck(env, j_obj.obj());
       break;
     case WebInputEvent::GestureTap:
       Java_ContentViewCore_onSingleTapEventAck(
           env,
           j_obj.obj(),
           ack_result == INPUT_EVENT_ACK_STATE_CONSUMED,
           event.x * dpi_scale(),
           event.y * dpi_scale());
       break;
-    case WebInputEvent::GestureDoubleTap:
-      Java_ContentViewCore_onDoubleTapEventAck(env, j_obj.obj());
-      break;
     default:
       break;
   }
 }
 
 bool ContentViewCoreImpl::FilterInputEvent(const blink::WebInputEvent& event) {
   if (event.type != WebInputEvent::GestureTap &&
       event.type != WebInputEvent::GestureDoubleTap &&
       event.type != WebInputEvent::GestureLongTap &&
       event.type != WebInputEvent::GestureLongPress)
@@ skipping 26 matching lines @@
 
 void ContentViewCoreImpl::OnSelectionChanged(const std::string& text) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   ScopedJavaLocalRef<jstring> jtext = ConvertUTF8ToJavaString(env, text);
   Java_ContentViewCore_onSelectionChanged(env, obj.obj(), jtext.obj());
 }
 
-void ContentViewCoreImpl::OnSelectionBoundsChanged(const gfx::PointF& anchor,
-                                                   const gfx::PointF& focus,
-                                                   int anchor_dir,
-                                                   int focus_dir,
-                                                   bool is_anchor_visible,
-                                                   bool is_focus_visible) {
+void ContentViewCoreImpl::OnSelectionEvent(SelectionEventType event,
+                                           const gfx::PointF& position) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
+  if (j_obj.is_null())
+    return;
+  Java_ContentViewCore_onSelectionEvent(
+      env, j_obj.obj(), event, position.x(), position.y());
+}
+
+scoped_ptr<TouchHandleDrawable>
+ContentViewCoreImpl::CreatePopupTouchHandleDrawable() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
-  if (obj.is_null())
-    return;
-  Java_ContentViewCore_onSelectionBoundsChanged(env,
-                                                obj.obj(),
-                                                anchor.x(),
-                                                anchor.y(),
-                                                focus.x(),
-                                                focus.y(),
-                                                anchor_dir,
-                                                focus_dir,
-                                                is_anchor_visible,
-                                                is_focus_visible);
+  if (obj.is_null()) {
+    NOTREACHED();
+    return scoped_ptr<TouchHandleDrawable>();
+  }
+  return scoped_ptr<TouchHandleDrawable>(new PopupTouchHandleDrawable(
+      Java_ContentViewCore_createPopupTouchHandleDrawable(env, obj.obj()),
+      dpi_scale_));
 }
 
 void ContentViewCoreImpl::ShowPastePopup(int x_dip, int y_dip) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_ContentViewCore_showPastePopup(env, obj.obj(),
                                       static_cast<jint>(x_dip),
                                       static_cast<jint>(y_dip));
@@ skipping 145 matching lines @@
 float ContentViewCoreImpl::GetOverdrawBottomHeightDip() const {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (j_obj.is_null())
     return 0.f;
   return Java_ContentViewCore_getOverdrawBottomHeightPix(env, j_obj.obj())
       / dpi_scale();
 }
 
 void ContentViewCoreImpl::AttachLayer(scoped_refptr<cc::Layer> layer) {
-  root_layer_->AddChild(layer);
+  root_layer_->InsertChild(layer, 0);
   root_layer_->SetIsDrawable(false);
 }
 
 void ContentViewCoreImpl::RemoveLayer(scoped_refptr<cc::Layer> layer) {
   layer->RemoveFromParent();
 
   if (!root_layer_->children().size())
     root_layer_->SetIsDrawable(true);
 }
 
+void ContentViewCoreImpl::SelectBetweenCoordinates(const gfx::PointF& start,
+                                                   const gfx::PointF& end) {
+  if (!web_contents_)
+    return;
+
+  gfx::Point anchor = gfx::Point(start.x(), start.y());
+  gfx::Point focus = gfx::Point(end.x(), end.y());
+  if (anchor.x() == focus.x() && anchor.y() == focus.y())

[cjhopman, 2014/07/09 22:29:12]

nit: if (anchor == focus) {

[jdduke (slow), 2014/07/10 02:08:39]

Done.

+    return;
+
+  web_contents_->SelectRange(anchor, focus);
+}
+
 void ContentViewCoreImpl::LoadUrl(
     NavigationController::LoadURLParams& params) {
   GetWebContents()->GetController().LoadURLWithParams(params);
 }
 
 ui::ViewAndroid* ContentViewCoreImpl::GetViewAndroid() const {
   // view_android_ should never be null for Chrome.
   DCHECK(view_android_);
   return view_android_;
 }
@@ skipping 168 matching lines @@
                            touch_major_1,
                            raw_pos_x,
                            raw_pos_y,
                            android_tool_type_0,
                            android_tool_type_1,
                            android_button_state);
 
   return rwhv->OnTouchEvent(event);
 }
 
+jboolean ContentViewCoreImpl::OnTouchHandleEvent(JNIEnv* env,
+                                                 jobject obj,
+                                                 jobject motion_event) {
+  RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
+  // Avoid synthesizing a touch event if it cannot be forwarded.
+  if (!rwhv)
+    return false;
+
+  const bool recycle = false;
+  MotionEventAndroid event(1.f / dpi_scale(), env, motion_event, recycle);
+
+  return rwhv->OnTouchHandleEvent(event);
+}
+
 float ContentViewCoreImpl::GetDpiScale() const {
   return dpi_scale_;
 }
 
 jboolean ContentViewCoreImpl::SendMouseMoveEvent(JNIEnv* env,
                                                  jobject obj,
                                                  jlong time_ms,
                                                  jfloat x,
                                                  jfloat y) {
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
@@ skipping 141 matching lines @@
   WebGestureEvent event = MakeGestureEvent(
       WebInputEvent::GesturePinchUpdate, time_ms, anchor_x, anchor_y);
   event.data.pinchUpdate.scale = delta;
 
   SendGestureEvent(event);
 }
 
 void ContentViewCoreImpl::SelectBetweenCoordinates(JNIEnv* env, jobject obj,
                                                    jfloat x1, jfloat y1,
                                                    jfloat x2, jfloat y2) {
-  if (!web_contents_)
-    return;
-
-  web_contents_->SelectRange(
-      gfx::Point(x1 / dpi_scale(), y1 / dpi_scale()),
-      gfx::Point(x2 / dpi_scale(), y2 / dpi_scale()));
+  SelectBetweenCoordinates(gfx::PointF(x1 / dpi_scale(), y1 / dpi_scale()),
+                           gfx::PointF(x2 / dpi_scale(), y2 / dpi_scale()));
 }
 
 void ContentViewCoreImpl::MoveCaret(JNIEnv* env, jobject obj,
                                     jfloat x, jfloat y) {
   if (GetRenderWidgetHostViewAndroid()) {
     GetRenderWidgetHostViewAndroid()->MoveCaret(
-        gfx::Point(x / dpi_scale(), y / dpi_scale()));
+        gfx::Point(x / dpi_scale_, y / dpi_scale_));
   }
 }
 
+void ContentViewCoreImpl::HideTextHandles(JNIEnv* env, jobject obj) {
+  if (GetRenderWidgetHostViewAndroid())
+    GetRenderWidgetHostViewAndroid()->HideTextHandles();
+}
+
 void ContentViewCoreImpl::ResetGestureDetection(JNIEnv* env, jobject obj) {
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
   if (rwhv)
     rwhv->ResetGestureDetection();
 }
 
 void ContentViewCoreImpl::SetDoubleTapSupportEnabled(JNIEnv* env,
                                                      jobject obj,
                                                      jboolean enabled) {
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
@@ skipping 354 matching lines @@
         static_cast<NavigationControllerImpl&>(web_contents_->GetController());
     controller.ReloadOriginalRequestURL(false);
   }
 }
 
 void ContentViewCoreImpl::SetAccessibilityEnabled(JNIEnv* env, jobject obj,
                                                   bool enabled) {
   SetAccessibilityEnabledInternal(enabled);
 }
 
-void ContentViewCoreImpl::ShowSelectionHandlesAutomatically() const {
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj(java_ref_.get(env));
-  if (obj.is_null())
-    return;
-  Java_ContentViewCore_showSelectionHandlesAutomatically(env, obj.obj());
-}
-
 bool ContentViewCoreImpl::IsFullscreenRequiredForOrientationLock() const {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return true;
   return Java_ContentViewCore_isFullscreenRequiredForOrientationLock(env,
                                                                      obj.obj());
 }
 
 void ContentViewCoreImpl::SetAccessibilityEnabledInternal(bool enabled) {
@@ skipping 147 matching lines @@
       reinterpret_cast<ui::WindowAndroid*>(window_android),
       retained_objects_set);
   return reinterpret_cast<intptr_t>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content