Merge lp:~osomon/oxide/touch-selection-api-updates into lp:~oxide-developers/oxide/oxide.trunk

[Olivier Tilloy]

Touch selection API updates:
 - enable adaptive handle orientation
 - add an 'handleDragInProgress' property to OxideQQuickTouchSelectionController
 - add a hide() method to OxideQQuickTouchSelectionController

The new 'handleDragInProgress' property will allow clients to hide a quick menu while a handle drag is in progress (required to comply with webbrowser-app’s design specification). Similarly, the hide() method will allow hiding the quick menu after tapping one of its actions, per design specification.

[lp:~osomon/oxide/touch-selection-api-updates]

1314. By Olivier Tilloy on 2016-03-03

Register updated TouchSelectionController type.

1315. By Olivier Tilloy on 2016-03-09

Add a hide() method on OxideQQuickTouchSelectionController.
This will be used to hide the handles and quick menu after tapping an action.

1316. By Olivier Tilloy on 2016-03-10

Merge the latest changes from trunk.

1317. By Olivier Tilloy on 2016-03-10

Fix build.

1318. By Olivier Tilloy on 2016-03-10

Update the qmltypes file with API additions.

[Chris Coulson (chrisccoulson)]

This is mostly ok - there's one small architectural issues though (I've left a comment inline)

review: Needs Fixing

[lp:~osomon/oxide/touch-selection-api-updates]

1319. By Olivier Tilloy on 2016-03-21

Bump revision to 1.15, as 1.14 has been branched already.

1320. By Olivier Tilloy on 2016-03-21

Move ownership of OxideQQuickTouchSelectionController to oxide::qquick::ContentsView.

[Olivier Tilloy (osomon)]

updated

[Chris Coulson (chrisccoulson)]

review: Approve

=== modified file 'qt/core/browser/oxide_qt_contents_view.cc'
--- qt/core/browser/oxide_qt_contents_view.cc	2016-03-15 23:29:57 +0000
+++ qt/core/browser/oxide_qt_contents_view.cc	2016-03-21 16:05:27 +0000
@@ -424,6 +424,10 @@
   }
 }
 
+void ContentsView::hideTouchSelectionController() {
+  view()->HideTouchSelectionController();
+}
+
 blink::WebScreenInfo ContentsView::GetScreenInfo() const {
   QScreen* screen = client_->GetScreen();
   if (!screen) {
@@ -512,12 +516,14 @@
 }
 
 void ContentsView::TouchSelectionChanged(bool active,
-                                         const gfx::RectF& bounds) const {
+                                         const gfx::RectF& bounds,
+                                         bool handle_drag_in_progress) const {
   gfx::RectF scaled_bounds =
       DpiUtils::ConvertChromiumPixelsToQt(bounds, GetScreen());
   client_->TouchSelectionChanged(
       active,
-      ToQt(DpiUtils::ConvertChromiumPixelsToQt(bounds, GetScreen())));
+      ToQt(DpiUtils::ConvertChromiumPixelsToQt(bounds, GetScreen())),
+      handle_drag_in_progress);
 }
 
 oxide::InputMethodContext* ContentsView::GetInputMethodContext() const {

=== modified file 'qt/core/browser/oxide_qt_contents_view.h'
--- qt/core/browser/oxide_qt_contents_view.h	2016-03-15 23:29:57 +0000
+++ qt/core/browser/oxide_qt_contents_view.h	2016-03-21 16:05:27 +0000
@@ -89,6 +89,7 @@
   void handleDragMoveEvent(QDragMoveEvent* event) override;
   void handleDragLeaveEvent(QDragLeaveEvent* event) override;
   void handleDropEvent(QDropEvent* event) override;
+  void hideTouchSelectionController() override;
 
   // InputMethodContextClient implementation
   void SetInputMethodEnabled(bool enabled);
@@ -107,7 +108,8 @@
   oxide::WebPopupMenu* CreatePopupMenu(content::RenderFrameHost* rfh) override;
   ui::TouchHandleDrawable* CreateTouchHandleDrawable() const override;
   void TouchSelectionChanged(bool active,
-                             const gfx::RectF& bounds) const override;
+                             const gfx::RectF& bounds,
+                             bool handle_drag_in_progress) const override;
   oxide::InputMethodContext* GetInputMethodContext() const override;
   void UnhandledKeyboardEvent(
       const content::NativeWebKeyboardEvent& event) override;

=== modified file 'qt/core/glue/oxide_qt_contents_view_proxy.h'
--- qt/core/glue/oxide_qt_contents_view_proxy.h	2016-02-29 21:56:19 +0000
+++ qt/core/glue/oxide_qt_contents_view_proxy.h	2016-03-21 16:05:27 +0000
@@ -92,6 +92,8 @@
   virtual void handleDragMoveEvent(QDragMoveEvent* event) = 0;
   virtual void handleDragLeaveEvent(QDragLeaveEvent* event) = 0;
   virtual void handleDropEvent(QDropEvent* event) = 0;
+
+  virtual void hideTouchSelectionController() = 0;
 };
 
 } // namespace qt

=== modified file 'qt/core/glue/oxide_qt_contents_view_proxy_client.h'
--- qt/core/glue/oxide_qt_contents_view_proxy_client.h	2016-02-29 20:40:07 +0000
+++ qt/core/glue/oxide_qt_contents_view_proxy_client.h	2016-03-21 16:05:27 +0000
@@ -66,7 +66,9 @@
       WebPopupMenuProxyClient* client) = 0;
   virtual TouchHandleDrawableProxy* CreateTouchHandleDrawable() = 0;
 
-  virtual void TouchSelectionChanged(bool active, const QRectF& bounds) = 0;
+  virtual void TouchSelectionChanged(bool active,
+                                     const QRectF& bounds,
+                                     bool handle_drag_in_progress) = 0;
 
   virtual void HandleUnhandledKeyboardEvent(QKeyEvent* event) = 0;
 

=== modified file 'qt/core/glue/oxide_qt_web_view_proxy.h'
--- qt/core/glue/oxide_qt_web_view_proxy.h	2016-02-29 20:40:07 +0000
+++ qt/core/glue/oxide_qt_web_view_proxy.h	2016-03-21 16:05:27 +0000
@@ -33,7 +33,6 @@
 class OxideQFindController;
 class OxideQNewViewRequest;
 class OxideQSecurityStatus;
-class OxideQTouchSelectionController;
 class OxideQWebPreferences;
 
 namespace oxide {

=== modified file 'qt/qmlplugin/oxide.qmltypes'
--- qt/qmlplugin/oxide.qmltypes	2016-01-12 11:45:54 +0000
+++ qt/qmlplugin/oxide.qmltypes	2016-03-21 16:05:27 +0000
@@ -292,9 +292,12 @@
     Component {
         name: "OxideQQuickTouchSelectionController"
         prototype: "QObject"
-        exports: ["TouchSelectionController 1.12"]
+        exports: [
+            "TouchSelectionController 1.12",
+            "TouchSelectionController 1.15"
+        ]
         isCreatable: false
-        exportMetaObjectRevisions: [0]
+        exportMetaObjectRevisions: [0, 1]
         Enum {
             name: "HandleOrientation"
             values: {
@@ -307,6 +310,9 @@
         Property { name: "active"; type: "bool"; isReadonly: true }
         Property { name: "handle"; type: "QQmlComponent"; isPointer: true }
         Property { name: "bounds"; type: "QRectF"; isReadonly: true }
+        Property { name: "handleDragInProgress"; revision: 1; type: "bool"; isReadonly: true }
+        Signal { name: "handleDragInProgressChanged"; revision: 1 }
+        Method { name: "hide"; revision: 1 }
     }
     Component {
         name: "OxideQQuickUserScript"

=== modified file 'qt/qmlplugin/oxide_qml_plugin.cc'
--- qt/qmlplugin/oxide_qml_plugin.cc	2016-01-13 19:05:43 +0000
+++ qt/qmlplugin/oxide_qml_plugin.cc	2016-03-21 16:05:27 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2015 Canonical Ltd.
+// Copyright (C) 2013-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -200,6 +200,11 @@
         "TouchSelectionController is accessed via "
         "WebView.touchSelectionController");
     qmlRegisterType<OxideQQuickWebView, 7>(uri, 1, 12, "WebView");
+
+    qmlRegisterUncreatableType<OxideQQuickTouchSelectionController, 1>(
+        uri, 1, 15, "TouchSelectionController",
+        "TouchSelectionController is accessed via "
+        "WebView.touchSelectionController");
   }
 };
 

=== modified file 'qt/quick/api/oxideqquicktouchselectioncontroller.cc'
--- qt/quick/api/oxideqquicktouchselectioncontroller.cc	2016-01-13 18:16:11 +0000
+++ qt/quick/api/oxideqquicktouchselectioncontroller.cc	2016-03-21 16:05:27 +0000
@@ -17,6 +17,8 @@
 
 #include "oxideqquicktouchselectioncontroller.h"
 
+#include "qt/quick/oxide_qquick_contents_view.h"
+
 #include "oxideqquickwebview_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -28,16 +30,18 @@
   OxideQQuickTouchSelectionControllerPrivate()
       : view(nullptr)
       , handle(nullptr)
-      , active(false) {}
+      , active(false)
+      , handle_drag_in_progress(false) {}
 
-  OxideQQuickWebView* view;
+  oxide::qquick::ContentsView* view;
   QQmlComponent* handle;
   bool active;
   QRectF bounds;
+  bool handle_drag_in_progress;
 };
 
 OxideQQuickTouchSelectionController::OxideQQuickTouchSelectionController(
-    OxideQQuickWebView* view)
+    oxide::qquick::ContentsView* view)
     : d_ptr(new OxideQQuickTouchSelectionControllerPrivate()) {
   Q_D(OxideQQuickTouchSelectionController);
 
@@ -46,6 +50,12 @@
 
 OxideQQuickTouchSelectionController::~OxideQQuickTouchSelectionController() {}
 
+void OxideQQuickTouchSelectionController::hide() const {
+  Q_D(const OxideQQuickTouchSelectionController);
+
+  d->view->hideTouchSelectionController();
+}
+
 bool OxideQQuickTouchSelectionController::active() const {
   Q_D(const OxideQQuickTouchSelectionController);
 
@@ -75,9 +85,16 @@
   return d->bounds;
 }
 
+bool OxideQQuickTouchSelectionController::handleDragInProgress() const {
+  Q_D(const OxideQQuickTouchSelectionController);
+
+  return d->handle_drag_in_progress;
+}
+
 void OxideQQuickTouchSelectionController::onTouchSelectionChanged(
     bool active,
-    const QRectF& bounds) {
+    const QRectF& bounds,
+    bool handle_drag_in_progress) {
   Q_D(OxideQQuickTouchSelectionController);
 
   if (active != d->active) {
@@ -89,4 +106,9 @@
     d->bounds = bounds;
     Q_EMIT boundsChanged();
   }
+
+  if (handle_drag_in_progress != d->handle_drag_in_progress) {
+    d->handle_drag_in_progress = handle_drag_in_progress;
+    Q_EMIT handleDragInProgressChanged();
+  }
 }

=== modified file 'qt/quick/api/oxideqquicktouchselectioncontroller.h'
--- qt/quick/api/oxideqquicktouchselectioncontroller.h	2016-02-23 22:03:59 +0000
+++ qt/quick/api/oxideqquicktouchselectioncontroller.h	2016-03-21 16:05:27 +0000
@@ -48,6 +48,7 @@
   Q_PROPERTY(bool active READ active NOTIFY activeChanged)
   Q_PROPERTY(QQmlComponent* handle READ handle WRITE setHandle NOTIFY handleChanged)
   Q_PROPERTY(QRectF bounds READ bounds NOTIFY boundsChanged)
+  Q_PROPERTY(bool handleDragInProgress READ handleDragInProgress NOTIFY handleDragInProgressChanged REVISION 1)
 
   Q_DISABLE_COPY(OxideQQuickTouchSelectionController)
   Q_DECLARE_PRIVATE(OxideQQuickTouchSelectionController)
@@ -55,6 +56,8 @@
  public:
   ~OxideQQuickTouchSelectionController() Q_DECL_OVERRIDE;
 
+  Q_REVISION(1) Q_INVOKABLE void hide() const;
+
   enum HandleOrientation {
     HandleOrientationLeft,
     HandleOrientationCenter,
@@ -69,18 +72,24 @@
 
   const QRectF& bounds() const;
 
+  bool handleDragInProgress() const;
+
  Q_SIGNALS:
   void activeChanged();
   void handleChanged();
   void boundsChanged();
+  Q_REVISION(1) void handleDragInProgressChanged();
 
  private:
   friend class OxideQQuickWebViewPrivate;
   friend class oxide::qquick::ContentsView;
 
-  Q_DECL_HIDDEN OxideQQuickTouchSelectionController(OxideQQuickWebView* view);
+  Q_DECL_HIDDEN OxideQQuickTouchSelectionController(
+      oxide::qquick::ContentsView* view);
 
-  void onTouchSelectionChanged(bool active, const QRectF& bounds);
+  void onTouchSelectionChanged(bool active,
+                               const QRectF& bounds,
+                               bool handle_drag_in_progress);
 
   QScopedPointer<OxideQQuickTouchSelectionControllerPrivate> d_ptr;
 };

=== modified file 'qt/quick/api/oxideqquickwebview.cc'
--- qt/quick/api/oxideqquickwebview.cc	2016-03-01 15:42:25 +0000
+++ qt/quick/api/oxideqquickwebview.cc	2016-03-21 16:05:27 +0000
@@ -60,7 +60,6 @@
 #include "oxideqquicklocationbarcontroller.h"
 #include "oxideqquickscriptmessagehandler.h"
 #include "oxideqquickscriptmessagehandler_p.h"
-#include "oxideqquicktouchselectioncontroller.h"
 #include "oxideqquickwebcontext.h"
 #include "oxideqquickwebcontext_p.h"
 #include "oxideqquickwebframe.h"
@@ -130,12 +129,7 @@
       before_unload_dialog_(nullptr),
       file_picker_(nullptr),
       using_old_load_event_signal_(false),
-      construct_props_(new ConstructProps()),
-      touch_selection_controller_(
-          new OxideQQuickTouchSelectionController(view)) {
-  contents_view_->set_touch_selection_controller(
-      touch_selection_controller_.data());
-}
+      construct_props_(new ConstructProps()) {}
 
 oxide::qt::JavaScriptDialogProxy*
 OxideQQuickWebViewPrivate::CreateJavaScriptDialog(
@@ -1878,7 +1872,7 @@
 OxideQQuickTouchSelectionController* OxideQQuickWebView::touchSelectionController() {
   Q_D(OxideQQuickWebView);
 
-  return d->touch_selection_controller_.data();
+  return d->contents_view_->touchSelectionController();
 }
 
 #include "moc_oxideqquickwebview.cpp"

=== modified file 'qt/quick/api/oxideqquickwebview_p.h'
--- qt/quick/api/oxideqquickwebview_p.h	2016-02-29 20:40:07 +0000
+++ qt/quick/api/oxideqquickwebview_p.h	2016-03-21 16:05:27 +0000
@@ -34,7 +34,6 @@
 class OxideQNewViewRequest;
 class OxideQQuickLocationBarController;
 class OxideQQuickScriptMessageHandler;
-class OxideQQuickTouchSelectionController;
 class OxideQQuickWebContextPrivate;
 class OxideQQuickWebView;
 
@@ -180,8 +179,6 @@
   QScopedPointer<ConstructProps> construct_props_;
 
   QScopedPointer<OxideQQuickLocationBarController> location_bar_controller_;
-
-  QScopedPointer<OxideQQuickTouchSelectionController> touch_selection_controller_;
 };
 
 #endif // _OXIDE_QT_QUICK_API_WEB_VIEW_P_P_H_

=== modified file 'qt/quick/oxide_qquick_contents_view.cc'
--- qt/quick/oxide_qquick_contents_view.cc	2016-02-29 20:40:07 +0000
+++ qt/quick/oxide_qquick_contents_view.cc	2016-03-21 16:05:27 +0000
@@ -158,12 +158,17 @@
 
 oxide::qt::TouchHandleDrawableProxy*
 ContentsView::CreateTouchHandleDrawable() {
-  return new TouchHandleDrawable(item_, touch_selection_controller_);
+  return new TouchHandleDrawable(item_, touch_selection_controller_.data());
 }
 
-void ContentsView::TouchSelectionChanged(bool active, const QRectF& bounds) {
+void ContentsView::TouchSelectionChanged(bool active,
+                                         const QRectF& bounds,
+                                         bool handle_drag_in_progress) {
   if (touch_selection_controller_) {
-    touch_selection_controller_->onTouchSelectionChanged(active, bounds);
+    touch_selection_controller_->onTouchSelectionChanged(
+        active,
+        bounds,
+        handle_drag_in_progress);
   }
 }
 
@@ -182,6 +187,8 @@
 
 ContentsView::ContentsView(QQuickItem* item)
     : item_(item),
+      touch_selection_controller_(
+          new OxideQQuickTouchSelectionController(this)),
       received_new_compositor_frame_(false),
       frame_evicted_(false),
       last_composited_frame_type_(
@@ -488,5 +495,13 @@
   return node;
 }
 
+void ContentsView::hideTouchSelectionController() const {
+  if (!proxy()) {
+    return;
+  }
+
+  proxy()->hideTouchSelectionController();
+}
+
 } // namespace qquick
 } // namespace oxide

=== modified file 'qt/quick/oxide_qquick_contents_view.h'
--- qt/quick/oxide_qquick_contents_view.h	2016-02-29 20:40:07 +0000
+++ qt/quick/oxide_qquick_contents_view.h	2016-03-21 16:05:27 +0000
@@ -21,6 +21,7 @@
 #include <QObject>
 #include <QPointer>
 #include <QQuickItem>
+#include <QScopedPointer>
 #include <QtGlobal>
 
 #include "qt/core/glue/oxide_qt_contents_view_proxy.h"
@@ -56,11 +57,6 @@
   ContentsView(QQuickItem* item);
   ~ContentsView() override;
 
-  void set_touch_selection_controller(
-      OxideQQuickTouchSelectionController* controller) {
-    touch_selection_controller_ = controller;
-  }
-
   QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
 
   void handleItemChange(QQuickItem::ItemChange change);
@@ -100,6 +96,12 @@
     popup_menu_ = popup_menu;
   }
 
+  OxideQQuickTouchSelectionController* touchSelectionController() const {
+    return touch_selection_controller_.data();
+  }
+
+  void hideTouchSelectionController() const;
+
  private Q_SLOTS:
   void windowChanged(QQuickWindow* window);
   void screenChanged(QScreen* screen);
@@ -132,11 +134,13 @@
   oxide::qt::WebPopupMenuProxy* CreateWebPopupMenu(
       oxide::qt::WebPopupMenuProxyClient* client) override;
   oxide::qt::TouchHandleDrawableProxy* CreateTouchHandleDrawable() override;
-  void TouchSelectionChanged(bool active, const QRectF& bounds) override;
+  void TouchSelectionChanged(bool active,
+                             const QRectF& bounds,
+                             bool handle_drag_in_progress) override;
   void HandleUnhandledKeyboardEvent(QKeyEvent* event) override;
 
   QPointer<QQuickItem> item_;
-  QPointer<OxideQQuickTouchSelectionController> touch_selection_controller_;
+  QScopedPointer<OxideQQuickTouchSelectionController> touch_selection_controller_;
 
   QPointer<QQuickWindow> window_;
   QPointer<QScreen> screen_;

=== modified file 'shared/browser/oxide_render_widget_host_view.cc'
--- shared/browser/oxide_render_widget_host_view.cc	2016-03-15 17:03:44 +0000
+++ shared/browser/oxide_render_widget_host_view.cc	2016-03-21 16:05:27 +0000
@@ -566,7 +566,7 @@
   if ((selection_controller_->active_status() !=
           ui::TouchSelectionController::INACTIVE) &&
       HasLocationBarOffsetChanged(old, displayed_frame_metadata_)) {
-    container_->TouchSelectionChanged();
+    container_->TouchSelectionChanged(handle_drag_in_progress_);
     // XXX: hack to ensure the position of the handles is updated.
     selection_controller_->SetTemporarilyHidden(true);
     selection_controller_->SetTemporarilyHidden(false);
@@ -698,8 +698,20 @@
 }
 
 void RenderWidgetHostView::OnSelectionEvent(ui::SelectionEventType event) {
+  switch (event) {
+    case ui::SELECTION_HANDLE_DRAG_STARTED:
+    case ui::INSERTION_HANDLE_DRAG_STARTED:
+      handle_drag_in_progress_ = true;
+      break;
+    case ui::SELECTION_HANDLE_DRAG_STOPPED:
+    case ui::INSERTION_HANDLE_DRAG_STOPPED:
+      handle_drag_in_progress_ = false;
+      break;
+    default:
+      break;
+  }
   if (container_) {
-    container_->TouchSelectionChanged();
+    container_->TouchSelectionChanged(handle_drag_in_progress_);
   }
 }
 
@@ -805,6 +817,7 @@
       is_showing_(!host->is_hidden()),
       top_controls_shrink_blink_size_(false),
       gesture_provider_(GestureProvider::Create(this)),
+      handle_drag_in_progress_(false),
       weak_ptr_factory_(this) {
   CHECK(host_) << "Implementation didn't supply a RenderWidgetHost";
 
@@ -816,7 +829,7 @@
   // default values from ui/events/gesture_detection/gesture_configuration.cc
   tsc_config.max_tap_duration = base::TimeDelta::FromMilliseconds(150);
   tsc_config.tap_slop = 15;
-  tsc_config.enable_adaptive_handle_orientation = false;
+  tsc_config.enable_adaptive_handle_orientation = true;
   tsc_config.show_on_tap_for_empty_editable = true;
   tsc_config.enable_longpress_drag_selection = false;
   selection_controller_.reset(

=== modified file 'shared/browser/oxide_render_widget_host_view.h'
--- shared/browser/oxide_render_widget_host_view.h	2016-03-11 23:24:08 +0000
+++ shared/browser/oxide_render_widget_host_view.h	2016-03-21 16:05:27 +0000
@@ -250,6 +250,7 @@
   scoped_ptr<GestureProvider> gesture_provider_;
 
   scoped_ptr<ui::TouchSelectionController> selection_controller_;
+  bool handle_drag_in_progress_;
 
   base::WeakPtrFactory<RenderWidgetHostView> weak_ptr_factory_;
 

=== modified file 'shared/browser/oxide_render_widget_host_view_container.h'
--- shared/browser/oxide_render_widget_host_view_container.h	2016-02-29 20:40:07 +0000
+++ shared/browser/oxide_render_widget_host_view_container.h	2016-03-21 16:05:27 +0000
@@ -73,7 +73,7 @@
 
   virtual ui::TouchHandleDrawable* CreateTouchHandleDrawable() const = 0;
 
-  virtual void TouchSelectionChanged() const = 0;
+  virtual void TouchSelectionChanged(bool handle_drag_in_progress) const = 0;
 
   virtual void EditingCapabilitiesChanged() = 0;
 };

=== modified file 'shared/browser/oxide_web_contents_view.cc'
--- shared/browser/oxide_web_contents_view.cc	2016-03-20 23:29:02 +0000
+++ shared/browser/oxide_web_contents_view.cc	2016-03-21 16:05:27 +0000
@@ -89,10 +89,7 @@
 
 ui::TouchSelectionController*
 WebContentsView::GetTouchSelectionController() const {
-  // We don't care about checking for a fullscreen view here - we're called
-  // from StartDragging which is only supported in RenderViews
-  content::RenderWidgetHostView* view =
-      web_contents()->GetRenderWidgetHostView();
+  content::RenderWidgetHostView* view = GetRenderWidgetHostView();
   if (!view) {
     return nullptr;
   }
@@ -307,11 +304,7 @@
     return;
   }
 
-  ui::TouchSelectionController* selection_controller =
-      GetTouchSelectionController();
-  if (selection_controller) {
-    selection_controller->HideAndDisallowShowingAutomatically();
-  }
+  HideTouchSelectionController();
 
   // As our implementation of gfx::Screen::GetDisplayNearestWindow always
   // returns an invalid display, the passed in image isn't quite correct.
@@ -407,7 +400,7 @@
   }
 
   EditingCapabilitiesChanged();
-  TouchSelectionChanged();
+  TouchSelectionChanged(false);
 }
 
 void WebContentsView::DidNavigateMainFrame(
@@ -434,7 +427,7 @@
 
   web_contents()->GetRenderWidgetHostView()->Hide();
 
-  TouchSelectionChanged();
+  TouchSelectionChanged(false);
 }
 
 void WebContentsView::DidDestroyFullscreenWidget(int routing_id) {
@@ -461,7 +454,7 @@
     orig_rwhv->Blur();
   }
 
-  TouchSelectionChanged();
+  TouchSelectionChanged(false);
 }
 
 void WebContentsView::DidAttachInterstitialPage() {
@@ -472,7 +465,7 @@
   rwhv->SetContainer(this);
   interstitial_rwh_id_ = rwhv->GetRenderWidgetHost();
 
-  TouchSelectionChanged();
+  TouchSelectionChanged(false);
 }
 
 void WebContentsView::DidDetachInterstitialPage() {
@@ -488,7 +481,7 @@
 
   static_cast<RenderWidgetHostView*>(rwh->GetView())->SetContainer(nullptr);
 
-  TouchSelectionChanged();
+  TouchSelectionChanged(false);
 }
 
 void WebContentsView::CompositorSwapFrame(CompositorFrameHandle* handle) {
@@ -599,7 +592,8 @@
   return client_->CreateTouchHandleDrawable();
 }
 
-void WebContentsView::TouchSelectionChanged() const {
+void WebContentsView::TouchSelectionChanged(
+    bool handle_drag_in_progress) const {
   if (!client_) {
     return;
   }
@@ -623,7 +617,7 @@
   }
   bounds.Offset(0, offset);
 
-  client_->TouchSelectionChanged(active, bounds);
+  client_->TouchSelectionChanged(active, bounds, handle_drag_in_progress);
 }
 
 void WebContentsView::EditingCapabilitiesChanged() {
@@ -686,7 +680,7 @@
 
   // Update client from view
   CursorChanged();
-  TouchSelectionChanged();
+  TouchSelectionChanged(false);
 }
 
 bool WebContentsView::IsVisible() const {
@@ -946,4 +940,12 @@
   content::RenderWidgetHostImpl::From(host)->NotifyScreenInfoChanged();
 }
 
+void WebContentsView::HideTouchSelectionController() {
+  ui::TouchSelectionController* selection_controller =
+      GetTouchSelectionController();
+  if (selection_controller) {
+    selection_controller->HideAndDisallowShowingAutomatically();
+  }
+}
+
 } // namespace oxide

=== modified file 'shared/browser/oxide_web_contents_view.h'
--- shared/browser/oxide_web_contents_view.h	2016-03-20 23:29:02 +0000
+++ shared/browser/oxide_web_contents_view.h	2016-03-21 16:05:27 +0000
@@ -136,6 +136,8 @@
   void FocusChanged();
   void ScreenUpdated();
 
+  void HideTouchSelectionController();
+
  private:
   WebContentsView(content::WebContents* web_contents);
 
@@ -235,7 +237,7 @@
   bool IsFullscreen() const override;
   float GetLocationBarHeight() const override;
   ui::TouchHandleDrawable* CreateTouchHandleDrawable() const override;
-  void TouchSelectionChanged() const override;
+  void TouchSelectionChanged(bool handle_drag_in_progress) const override;
   void EditingCapabilitiesChanged() override;
 
   WebContentsViewClient* client_;

=== modified file 'shared/browser/oxide_web_contents_view_client.cc'
--- shared/browser/oxide_web_contents_view_client.cc	2016-02-29 20:40:07 +0000
+++ shared/browser/oxide_web_contents_view_client.cc	2016-03-21 16:05:27 +0000
@@ -53,7 +53,8 @@
 
 void WebContentsViewClient::TouchSelectionChanged(
     bool active,
-    const gfx::RectF& bounds) const {}
+    const gfx::RectF& bounds,
+    bool handle_drag_in_progress) const {}
 
 InputMethodContext* WebContentsViewClient::GetInputMethodContext() const {
   return nullptr;

=== modified file 'shared/browser/oxide_web_contents_view_client.h'
--- shared/browser/oxide_web_contents_view_client.h	2016-03-01 18:44:48 +0000
+++ shared/browser/oxide_web_contents_view_client.h	2016-03-21 16:05:27 +0000
@@ -69,7 +69,8 @@
 
   virtual ui::TouchHandleDrawable* CreateTouchHandleDrawable() const;
   virtual void TouchSelectionChanged(bool active,
-                                     const gfx::RectF& bounds) const;
+                                     const gfx::RectF& bounds,
+                                     bool handle_drag_in_progress) const;
 
   virtual InputMethodContext* GetInputMethodContext() const;