Reland: Move TouchSelectionController from content to ui

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"
@@ skipping 27 matching lines @@
 #include "content/browser/devtools/render_view_devtools_agent_host.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/media/media_web_contents_observer.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h"
-#include "content/browser/renderer_host/input/touch_selection_controller.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_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/common/input/did_overscroll_params.h"
@@ skipping 15 matching lines @@
 #include "ui/base/android/window_android_compositor.h"
 #include "ui/events/gesture_detection/gesture_provider_config_helper.h"
 #include "ui/events/gesture_detection/motion_event.h"
 #include "ui/gfx/android/device_display_info.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/android/view_configuration.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size_conversions.h"
+#include "ui/touch_selection/touch_selection_controller.h"
 
 namespace content {
 
 namespace {
 
 const int kUndefinedOutputSurfaceId = -1;
 
 // Used to accomodate finite precision when comparing scaled viewport and
 // content widths. While this value may seem large, width=device-width on an N7
 // V1 saw errors of ~0.065 between computed window and content widths.
@@ skipping 156 matching lines @@
     latency_info.AddLatencyNumberWithTimestamp(
         ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT,
         0,
         0,
         base::TimeTicks() + base::TimeDelta::FromMicroseconds(time_micros),
         1);
   }
   return latency_info;
 }
 
-scoped_ptr<TouchSelectionController> CreateSelectionController(
-    TouchSelectionControllerClient* client,
+scoped_ptr<ui::TouchSelectionController> CreateSelectionController(
+    ui::TouchSelectionControllerClient* client,
     ContentViewCore* content_view_core) {
   DCHECK(client);
   DCHECK(content_view_core);
   int tap_timeout_ms = gfx::ViewConfiguration::GetTapTimeoutInMs();
   int touch_slop_pixels = gfx::ViewConfiguration::GetTouchSlopInPixels();
-  return make_scoped_ptr(new TouchSelectionController(
+  return make_scoped_ptr(new ui::TouchSelectionController(
       client,
       base::TimeDelta::FromMilliseconds(tap_timeout_ms),
       touch_slop_pixels / content_view_core->GetDpiScale()));
 }
 
 scoped_ptr<OverscrollControllerAndroid> CreateOverscrollController(
     ContentViewCore* content_view_core) {
   DCHECK(content_view_core);
   ui::WindowAndroid* window = content_view_core->GetWindowAndroid();
   DCHECK(window);
@@ skipping 960 matching lines @@
 }
 
 void RenderWidgetHostViewAndroid::SelectBetweenCoordinates(
     const gfx::PointF& base,
     const gfx::PointF& extent) {
   DCHECK(content_view_core_);
   content_view_core_->SelectBetweenCoordinates(base, extent);
 }
 
 void RenderWidgetHostViewAndroid::OnSelectionEvent(
-    SelectionEventType event,
+    ui::SelectionEventType event,
     const gfx::PointF& position) {
   DCHECK(content_view_core_);
   // Showing the selection action bar can alter the current View coordinates in
   // such a way that the current MotionEvent stream is suddenly shifted in
   // space. Avoid the associated scroll jump by pre-emptively cancelling gesture
   // detection; scrolling after the selection is activated is unnecessary.
-  if (event == SelectionEventType::SELECTION_SHOWN)
+  if (event == ui::SelectionEventType::SELECTION_SHOWN)
     ResetGestureDetection();
   content_view_core_->OnSelectionEvent(event, position);
 }
 
-scoped_ptr<TouchHandleDrawable> RenderWidgetHostViewAndroid::CreateDrawable() {
+scoped_ptr<ui::TouchHandleDrawable>
+RenderWidgetHostViewAndroid::CreateDrawable() {
   DCHECK(content_view_core_);
   if (!using_browser_compositor_)
     return content_view_core_->CreatePopupTouchHandleDrawable();
 
-  return scoped_ptr<TouchHandleDrawable>(new CompositedTouchHandleDrawable(
+  return scoped_ptr<ui::TouchHandleDrawable>(new CompositedTouchHandleDrawable(
       content_view_core_->GetLayer().get(),
       content_view_core_->GetDpiScale(),
       // Use the activity context (instead of the application context) to ensure
       // proper handle theming.
       content_view_core_->GetContext().obj()));
 }
 
 void RenderWidgetHostViewAndroid::SynchronousCopyContents(
     const gfx::Rect& src_subrect_in_pixel,
     const gfx::Size& dst_size_in_pixel,
@@ skipping 33 matching lines @@
       !has_fixed_page_scale && !has_mobile_viewport);
 
   if (!content_view_core_)
     return;
 
   if (overscroll_controller_)
     overscroll_controller_->OnFrameMetadataUpdated(frame_metadata);
 
   if (selection_controller_) {
     selection_controller_->OnSelectionBoundsChanged(
-        frame_metadata.selection_start, frame_metadata.selection_end);
+        ui::SelectionBound(frame_metadata.selection_start),
+        ui::SelectionBound(frame_metadata.selection_end));
   }
 
   // All offsets and sizes are in CSS pixels.
   content_view_core_->UpdateFrameInfo(
       frame_metadata.root_scroll_offset,
       frame_metadata.page_scale_factor,
       gfx::Vector2dF(frame_metadata.min_page_scale_factor,
                      frame_metadata.max_page_scale_factor),
       frame_metadata.root_layer_size,
       frame_metadata.scrollable_viewport_size,
@@ skipping 290 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.
-  cc::ViewportSelectionBound insertion_bound;
-  insertion_bound.type = cc::SELECTION_BOUND_CENTER;
-  insertion_bound.visible = true;
-  insertion_bound.edge_top = point;
-  insertion_bound.edge_bottom = point;
+  ui::SelectionBound insertion_bound;
+  insertion_bound.set_type(ui::SelectionBound::CENTER);
+  insertion_bound.set_visible(true);
+  insertion_bound.SetEdge(point, point);
   selection_controller_->HideAndDisallowShowingAutomatically();
   selection_controller_->OnSelectionEditable(true);
   selection_controller_->OnSelectionEmpty(true);
   selection_controller_->OnSelectionBoundsChanged(insertion_bound,
                                                   insertion_bound);
   selection_controller_->AllowShowingFromCurrentSelection();
 }
 
 SkColor RenderWidgetHostViewAndroid::GetCachedBackgroundColor() const {
   return cached_background_color_;
@@ skipping 246 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