Reland: Implement Aura side of unified touch text selection for contents

content/browser/web_contents/web_contents_view_aura.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/web_contents/web_contents_view_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/download/drag_download_util.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/overscroll_controller.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "content/browser/renderer_host/web_input_event_aura.h"
 #include "content/browser/web_contents/aura/gesture_nav_simple.h"
 #include "content/browser/web_contents/aura/image_window_delegate.h"
 #include "content/browser/web_contents/aura/overscroll_navigation_overlay.h"
 #include "content/browser/web_contents/aura/shadow_layer_delegate.h"
 #include "content/browser/web_contents/aura/window_slider.h"
-#include "content/browser/web_contents/touch_editable_impl_aura.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/overscroll_configuration.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ skipping 580 matching lines @@
       }
 #endif
     }
   }
 
   void OnWindowBoundsChanged(aura::Window* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override {
     if (window == host_window_ || window == view_->window_) {
       SendScreenRects();
-      if (view_->touch_editable_)
-        view_->touch_editable_->UpdateEditingController();
+      if (old_bounds.origin() != new_bounds.origin()) {
+        RenderWidgetHostViewAura* rwhv = ToRenderWidgetHostViewAura(
+            view_->web_contents_->GetRenderWidgetHostView());
+        if (rwhv)
+          rwhv->selection_controller()->OnWindowMoved();
+      }
 #if defined(OS_WIN)
     } else {
       UpdateConstrainedWindows(NULL);
 #endif
     }
   }
 
   void OnWindowDestroying(aura::Window* window) override {
     if (window == host_window_) {
       host_window_->RemoveObserver(this);
@@ skipping 105 matching lines @@
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate)
     : web_contents_(web_contents),
       delegate_(delegate),
       current_drag_op_(blink::WebDragOperationNone),
       drag_dest_delegate_(NULL),
       current_rvh_for_drag_(NULL),
       overscroll_change_brightness_(false),
       current_overscroll_gesture_(OVERSCROLL_NONE),
       completed_overscroll_gesture_(OVERSCROLL_NONE),
-      touch_editable_(TouchEditableImplAura::Create()),
       is_or_was_visible_(false) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, private:
 
 WebContentsViewAura::~WebContentsViewAura() {
   if (!window_)
     return;
 
   window_observer_.reset();
   window_->RemoveObserver(this);
 
   // Window needs a valid delegate during its destructor, so we explicitly
   // delete it here.
   window_.reset();
 }
 
-void WebContentsViewAura::SetTouchEditableForTest(
-    TouchEditableImplAura* touch_editable) {
-  touch_editable_.reset(touch_editable);
-  AttachTouchEditableToRenderView();
-}
-
 void WebContentsViewAura::SizeChangedCommon(const gfx::Size& size) {
   if (web_contents_->GetInterstitialPage())
     web_contents_->GetInterstitialPage()->SetSize(size);
   RenderWidgetHostView* rwhv =
       web_contents_->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetSize(size);
 }
 
 void WebContentsViewAura::EndDrag(blink::WebDragOperationsMask ops) {
@@ skipping 193 matching lines @@
     ratio = 1.f - ratio;
   float brightness = current_overscroll_gesture_ == OVERSCROLL_WEST ?
       kBrightnessMin + ratio * (kBrightnessMax - kBrightnessMin) :
       kBrightnessMax - ratio * (kBrightnessMax - kBrightnessMin);
   brightness = std::max(kBrightnessMin, brightness);
   brightness = std::min(kBrightnessMax, brightness);
   aura::Window* window = GetWindowToAnimateForOverscroll();
   window->layer()->SetLayerBrightness(brightness);
 }
 
-void WebContentsViewAura::AttachTouchEditableToRenderView() {
-  if (!touch_editable_)
-    return;
-  RenderWidgetHostViewAura* rwhva = ToRenderWidgetHostViewAura(
-      web_contents_->GetRenderWidgetHostView());
-  touch_editable_->AttachToView(rwhva);
-}
-
 void WebContentsViewAura::OverscrollUpdateForWebContentsDelegate(
     float delta_y) {
   if (web_contents_->GetDelegate() && IsScrollEndEffectEnabled())
     web_contents_->GetDelegate()->OverscrollUpdate(delta_y);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, WebContentsView implementation:
 
 gfx::NativeView WebContentsViewAura::GetNativeView() const {
@@ skipping 158 matching lines @@
 
   // We listen to drag drop events in the newly created view's window.
   aura::client::SetDragDropDelegate(view->GetNativeView(), this);
 
   if (view->overscroll_controller() &&
       (!web_contents_->GetDelegate() ||
        web_contents_->GetDelegate()->CanOverscrollContent())) {
     InstallOverscrollControllerDelegate(view);
   }
 
-  AttachTouchEditableToRenderView();
+  //AttachTouchEditableToRenderView();
 
 #if defined(OS_WIN)
   if (legacy_hwnd_)
     view->SetLegacyRenderWidgetHostHWND(legacy_hwnd_.get());
 #endif
 
   return view;
 }
 
 RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForPopupWidget(
@@ skipping 10 matching lines @@
 void WebContentsViewAura::SetPageTitle(const base::string16& title) {
   window_->SetTitle(title);
 }
 
 void WebContentsViewAura::RenderViewCreated(RenderViewHost* host) {
 }
 
 void WebContentsViewAura::RenderViewSwappedIn(RenderViewHost* host) {
   if (navigation_overlay_.get() && navigation_overlay_->has_window())
     navigation_overlay_->StartObserving();
-  AttachTouchEditableToRenderView();
+  //AttachTouchEditableToRenderView();
 }
 
 void WebContentsViewAura::SetOverscrollControllerEnabled(bool enabled) {
   RenderWidgetHostViewAura* view =
       ToRenderWidgetHostViewAura(web_contents_->GetRenderWidgetHostView());
   if (view) {
     view->SetOverscrollControllerEnabled(enabled);
     if (enabled)
       InstallOverscrollControllerDelegate(view);
   }
 
   if (!enabled)
     navigation_overlay_.reset();
   else if (!navigation_overlay_)
     navigation_overlay_.reset(new OverscrollNavigationOverlay(web_contents_));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, RenderViewHostDelegateView implementation:
 
 void WebContentsViewAura::ShowContextMenu(RenderFrameHost* render_frame_host,
                                           const ContextMenuParams& params) {
-  if (touch_editable_) {
-    touch_editable_->EndTouchEditing(false);
-  }
+  RenderWidgetHostViewAura* rwhv =
+      ToRenderWidgetHostViewAura(web_contents_->GetRenderWidgetHostView());
+  if (rwhv)
+    rwhv->selection_controller()->HideAndDisallowShowingAutomatically();
   if (delegate_) {
     delegate_->ShowContextMenu(render_frame_host, params);
     // WARNING: we may have been deleted during the call to ShowContextMenu().
   }
 }
 
 void WebContentsViewAura::StartDragging(
     const DropData& drop_data,
     blink::WebDragOperationsMask operations,
     const gfx::ImageSkia& image,
     const gfx::Vector2d& image_offset,
     const DragEventSourceInfo& event_info) {
   aura::Window* root_window = GetNativeView()->GetRootWindow();
   if (!aura::client::GetDragDropClient(root_window)) {
     web_contents_->SystemDragEnded();
     return;
   }
 
-  if (touch_editable_)
-    touch_editable_->EndTouchEditing(false);
+  RenderWidgetHostViewAura* rwhv =
+      ToRenderWidgetHostViewAura(web_contents_->GetRenderWidgetHostView());
+  if (rwhv)
+    rwhv->selection_controller()->HideAndDisallowShowingAutomatically();
 
   ui::OSExchangeData::Provider* provider = ui::OSExchangeData::CreateProvider();
   PrepareDragData(drop_data, provider, web_contents_);
 
   ui::OSExchangeData data(provider);  // takes ownership of |provider|.
 
   if (!image.isNull())
     drag_utils::SetDragImageOnDataObject(image, image_offset, &data);
 
   scoped_ptr<WebDragSourceAura> drag_source(
@@ skipping 112 matching lines @@
 }
 
 void WebContentsViewAura::OnOverscrollModeChange(OverscrollMode old_mode,
                                                  OverscrollMode new_mode) {
   // Reset any in-progress overscroll animation first.
   ResetOverscrollTransform();
 
   if (old_mode == OVERSCROLL_NORTH || old_mode == OVERSCROLL_SOUTH)
     OverscrollUpdateForWebContentsDelegate(0);
 
-  if (new_mode != OVERSCROLL_NONE && touch_editable_)
-    touch_editable_->OverscrollStarted();
+  if (new_mode != OVERSCROLL_NONE) {
+    RenderWidgetHostViewAura* rwhv =
+        ToRenderWidgetHostViewAura(web_contents_->GetRenderWidgetHostView());
+    if (rwhv)
+      rwhv->selection_controller()->OnOverscrollStarted();
+  }
 
   if (new_mode == OVERSCROLL_NONE ||
       !GetContentNativeView() ||
       ((new_mode == OVERSCROLL_EAST || new_mode == OVERSCROLL_WEST) &&
        navigation_overlay_.get() && navigation_overlay_->has_window())) {
     current_overscroll_gesture_ = OVERSCROLL_NONE;
   } else {
     aura::Window* target = GetWindowToAnimateForOverscroll();
     if (target) {
       StopObservingImplicitAnimations();
@@ skipping 21 matching lines @@
 
   if (ShouldNavigateForward(web_contents_->GetController(),
                             completed_overscroll_gesture_)) {
     web_contents_->GetController().GoForward();
     PrepareOverscrollNavigationOverlay();
   } else if (ShouldNavigateBack(web_contents_->GetController(),
                                 completed_overscroll_gesture_)) {
     web_contents_->GetController().GoBack();
     PrepareOverscrollNavigationOverlay();
   } else {
-    if (touch_editable_)
-      touch_editable_->OverscrollCompleted();
+    RenderWidgetHostViewAura* rwhv =
+        ToRenderWidgetHostViewAura(web_contents_->GetRenderWidgetHostView());
+    if (rwhv)
+      rwhv->selection_controller()->OnOverscrollCompleted();
   }
 
   aura::Window* content = GetContentNativeView();
   if (content) {
     content->SetTransform(gfx::Transform());
     content->layer()->SetLayerBrightness(0.f);
   }
   current_overscroll_gesture_ = OVERSCROLL_NONE;
   completed_overscroll_gesture_ = OVERSCROLL_NONE;
   overscroll_window_.reset();
@@ skipping 256 matching lines @@
   BrowserAccessibilityManager* manager =
       web_contents_->GetRootBrowserAccessibilityManager();
   if (!manager)
     return nullptr;
 
   return manager->GetRoot()->ToBrowserAccessibilityWin();
 }
 #endif
 
 }  // namespace content