Plumb selection edge points through the compositor

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 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/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include "base/android/build_info.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/threading/worker_pool.h"
 #include "cc/base/latency_info_swap_promise.h"
 #include "cc/layers/delegated_frame_provider.h"
 #include "cc/layers/delegated_renderer_layer.h"
 #include "cc/layers/layer.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
+#include "cc/output/viewport_selection_bound.h"
 #include "cc/resources/single_release_callback.h"
 #include "cc/trees/layer_tree_host.h"
 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
 #include "content/browser/android/composited_touch_handle_drawable.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/edge_effect.h"
 #include "content/browser/android/edge_effect_l.h"
 #include "content/browser/android/in_process/synchronous_compositor_impl.h"
 #include "content/browser/android/overscroll_glow.h"
 #include "content/browser/devtools/render_view_devtools_agent_host.h"
@@ skipping 731 matching lines @@
   std::string utf8_selection = base::UTF16ToUTF8(text.substr(pos, n));
 
   content_view_core_->OnSelectionChanged(utf8_selection);
 }
 
 void RenderWidgetHostViewAndroid::SelectionBoundsChanged(
     const ViewHostMsg_SelectionBounds_Params& params) {
   if (!selection_controller_)
     return;
 
-  gfx::RectF anchor_rect(params.anchor_rect);
-  gfx::RectF focus_rect(params.focus_rect);
+  gfx::RectF start_rect(params.anchor_rect);

[aelias_OOO_until_Jul13, 2014/08/20 21:41:03]

Can you go ahead and change ViewHostMsg_SelectionBounds_Params to points as
well?

[jdduke (slow), 2014/08/20 21:58:43]

I could, except there's a good amount of dependent Aura code. As soon as we push
through trchen@'s Blink patch we should no longer need
ViewHostMsg_SelectionBounds_Params when using the TouchSelectionController.

+  gfx::RectF end_rect(params.focus_rect);
   if (params.is_anchor_first)
-    std::swap(anchor_rect, focus_rect);
+    std::swap(start_rect, end_rect);
 
-  TouchHandleOrientation anchor_orientation(TOUCH_HANDLE_ORIENTATION_UNDEFINED);
-  TouchHandleOrientation focus_orientation(TOUCH_HANDLE_ORIENTATION_UNDEFINED);
+  cc::ViewportSelectionBound start_bound, end_bound;
+  start_bound.visible = true;
+  end_bound.visible = true;
+  start_bound.edge_top = start_rect.origin();
+  start_bound.edge_bottom = start_rect.bottom_left();

[aelias_OOO_until_Jul13, 2014/08/20 21:41:03]

If we have to stay with the rect for some reason, I think bottom_right is better
for rotated cases?  (Not sure if those can happen in this codepath but we should
be consistent when we do use a rect).

[jdduke (slow), 2014/08/20 21:58:44]

This code will all be ripped out in https://codereview.chromium.org/359033002/.

+  end_bound.edge_top = end_rect.origin();
+  end_bound.edge_bottom = end_rect.bottom_left();
+
   if (params.anchor_rect == params.focus_rect) {
     if (params.anchor_rect.x() && params.anchor_rect.y())
-      anchor_orientation = focus_orientation = TOUCH_HANDLE_CENTER;
+      start_bound.type = end_bound.type = cc::SELECTION_BOUND_CENTER;
   } else {
-    anchor_orientation = params.anchor_dir == blink::WebTextDirectionRightToLeft
-                             ? TOUCH_HANDLE_LEFT
-                             : TOUCH_HANDLE_RIGHT;
-    focus_orientation = params.focus_dir == blink::WebTextDirectionRightToLeft
-                            ? TOUCH_HANDLE_RIGHT
-                            : TOUCH_HANDLE_LEFT;
+    start_bound.type = params.anchor_dir == blink::WebTextDirectionRightToLeft
+                           ? cc::SELECTION_BOUND_LEFT
+                           : cc::SELECTION_BOUND_RIGHT;
+    end_bound.type = params.focus_dir == blink::WebTextDirectionRightToLeft
+                         ? cc::SELECTION_BOUND_RIGHT
+                         : cc::SELECTION_BOUND_LEFT;
   }
 
-  selection_controller_->OnSelectionBoundsChanged(anchor_rect,
-                                                  anchor_orientation,
-                                                  true,
-                                                  focus_rect,
-                                                  focus_orientation,
-                                                  true);
+  selection_controller_->OnSelectionBoundsChanged(start_bound, end_bound);
 }
 
 void RenderWidgetHostViewAndroid::SetBackgroundOpaque(bool opaque) {
   RenderWidgetHostViewBase::SetBackgroundOpaque(opaque);
   host_->SetBackgroundOpaque(opaque);
 }
 
 void RenderWidgetHostViewAndroid::CopyFromCompositingSurface(
     const gfx::Rect& src_subrect,
     const gfx::Size& dst_size,
@@ skipping 675 matching lines @@
 
 void RenderWidgetHostViewAndroid::OnShowingPastePopup(
     const gfx::PointF& point) {
   if (!selection_controller_)
     return;
 
   // As the paste popup may be triggered *before* the bounds and editability
   // of the region have been updated, explicitly set the properties now.
   // TODO(jdduke): Remove this workaround when auxiliary paste popup
   // notifications are no longer required, crbug.com/398170.
-  gfx::RectF rect(point, gfx::SizeF());
-  TouchHandleOrientation orientation = TOUCH_HANDLE_CENTER;
-  const bool visible = true;
+  cc::ViewportSelectionBound insertion_bound;
+  insertion_bound.type = cc::SELECTION_BOUND_LEFT;
+  insertion_bound.visible = true;
+  insertion_bound.edge_top = point;
+  insertion_bound.edge_bottom = point;
   HideTextHandles();
   ShowSelectionHandlesAutomatically();
   selection_controller_->OnSelectionEditable(true);
   selection_controller_->OnSelectionEmpty(true);
-  selection_controller_->OnSelectionBoundsChanged(
-      rect, orientation, visible, rect, orientation, visible);
+  selection_controller_->OnSelectionBoundsChanged(insertion_bound,
+                                                  insertion_bound);
 }
 
 SkColor RenderWidgetHostViewAndroid::GetCachedBackgroundColor() const {
   return cached_background_color_;
 }
 
 void RenderWidgetHostViewAndroid::DidOverscroll(
     const DidOverscrollParams& params) {
   if (!content_view_core_ || !layer_ || !is_showing_)
     return;
@@ skipping 278 matching lines @@
   results->orientationAngle = display.RotationAsDegree();
   results->orientationType =
       RenderWidgetHostViewBase::GetOrientationTypeForMobile(display);
   gfx::DeviceDisplayInfo info;
   results->depth = info.GetBitsPerPixel();
   results->depthPerComponent = info.GetBitsPerComponent();
   results->isMonochrome = (results->depthPerComponent == 0);
 }
 
 } // namespace content