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

[Olivier Tilloy]

Add a touch selection API, to allow embedders to display handles for resizing the current selection, and contextual actions for it.

Initial proposal for a touch selection API.
Feedback on the proposed API and architecture welcome.

I shared a small example here for tests, along with screenshots of how this looks like on an MX4: http://people.canonical.com/~osomon/oxide-touch-selection/.

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

1274. By Olivier Tilloy on 2015-11-11

Report the actual selected text.

1275. By Olivier Tilloy on 2015-11-11

Rename selectionText to selectedText for consistency with chromium’s API.

1276. By Olivier Tilloy on 2015-11-11

Re-create the touch selection handles if the embedder modifies the component on the fly.

1277. By Olivier Tilloy on 2015-11-11

Add a 'bounds' property to the touch selection controller.

[Olivier Tilloy (osomon)]

This should now be ready for review.

Regarding this comment:

    // XXX: if editable, can we determine whether undo/redo is available?

It doesn’t look like the content API exposes a way to get at the currently focused editor, nor a canUndo() method of some sort.

[Olivier Tilloy (osomon)]

I tested further and I’m seeing one issue with the positioning of the handles and of the bounds when the locationBarController is used: the positions are offset by the height of the location bar.

review: Needs Fixing

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

1278. By Olivier Tilloy on 2015-11-13

Take into account the location bar offset.

1279. By Olivier Tilloy on 2015-11-13

Update the bounding rect and positions of the handles if the location bar offset changes while a touch selection is active.

[Olivier Tilloy (osomon)]

The issue I was pointing out above should be fixed now.

review: Abstain

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

1280. By Olivier Tilloy on 2015-11-13

Enable adaptive handle orientation, and expose the mirrorVertical and mirrorHorizontal properties.

1281. By Olivier Tilloy on 2015-11-13

Disable adaptive handle orientation for now, to match what chrome on android does.

1282. By Olivier Tilloy on 2015-11-16

Version 1.12 of the QML plugin corresponds to revision 7 of the WebView’s API.

1283. By Olivier Tilloy on 2015-11-20

Expose the horizontalPaddingRatio property on the handle component.

1284. By Olivier Tilloy on 2015-11-30

Merge the latest changes from trunk, and resolve a few conflicts.

1285. By Olivier Tilloy on 2015-11-30

Copy ConvertSelectionBound()’s implementation from content/browser/renderer_host/input/ui_touch_selection_helper.cc because that helper is not part of content’s public API.

[Chris Coulson (chrisccoulson)]

Sorry for taking ages on this. Whilst I continue to review the implementation, I do have some high-level comments on the API:

- OxideQQuickTouchSelectionController::editFlags would be better off as a property on WebView (as editingCapabilities or something), given that it has executeEditingCommand() there. This isn't unique to touch selection, and it's something that WebView needs anyway.
- The read only properties on OxideQQuickTouchSelection have setters in what will eventually be a public header. There shouldn't be public setters for these if they're only updated from Oxide.
- It's not clear what OxideQQuickTouchSelectionController::selectedText will be used for.
- OxideQQuickTouchSelectionController::Orientation should probably be OxideQQuickTouchSelectionController::HandleOrientation.
- Will horizontalPaddingRatio be used for our touch handles? It's always zero in Chrome/Aura and 0.25f in Chrome/Android. If we don't have a use for this in the design of our touch handles, I'd prefer this not to be exposed.

[Olivier Tilloy (osomon)]

> - Will horizontalPaddingRatio be used for our touch handles? It's
> always zero in Chrome/Aura and 0.25f in Chrome/Android. If we don't
> have a use for this in the design of our touch handles, I'd prefer
> this not to be exposed.

Yes. This is necessary if the arrow/pointer of the assets is not aligned to the right (for the left handle) / to the left (for the right handle). It seems the selection handles in the Ubuntu UITK are being redesigned at the moment, so there are no definite visuals yet, but I’ve seen some mockups where the arrow is horizontally centered, for which horizontalPaddingRatio needs to be 0.5f.

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

1286. By Olivier Tilloy on 2015-12-04

Remove the selectedText read-only property from OxideQQuickTouchSelectionController,
it’s not really useful since the webview has cut/copy/paste commands which interact directly with the clipboard.

1287. By Olivier Tilloy on 2015-12-04

Rename OxideQQuickTouchSelectionController::Orientation to OxideQQuickTouchSelectionController::HandleOrientation.

1288. By Olivier Tilloy on 2015-12-07

Move OxideQQuickTouchSelectionController::editFlags to OxideQQuickWebView::editingCapabilities.

1289. By Olivier Tilloy on 2015-12-07

Remove setters for the 'active' and 'bounds' properties on OxideQQuickTouchSelectionController.

[Olivier Tilloy (osomon)]

All your high-level comments on the API should now be addressed/answered.

[Olivier Tilloy (osomon)]

I’m currently adding unit tests for WebView.editingCapabilities, and facing an issue: the current implementation emits editingCapabilitiesChanged whenever the selection bounds change, which seems to cover most use cases, but one: when the user issues the Copy command, the contents of the clipboard change, and the editing caps potentially change with it (if the clipboard was empty, the PasteCapability becomes true). Emitting editingCapabilitiesChanged in WebView::executeEditingCommand() just after calling contents::WebContents::Copy() doesn’t do the trick, as copying content to the clipboard is async (and thus by the time the signal is emitted the content might not have been copied to the clipboard yet).

In fact the problem is more general than that: if content is copied to the clipboard outside of the application, there’s no way to get notified of it and update the editing caps. There’s a comment in chrome/browser/ui/views/frame/browser_view.cc (above BrowserView::CutCopyPaste()) that suggests that this is currently not possible anyway.

Is WebView.editingCapabilities a good idea after all?

[Chris Coulson (chrisccoulson)]

> I’m currently adding unit tests for WebView.editingCapabilities, and facing an
> issue: the current implementation emits editingCapabilitiesChanged whenever
> the selection bounds change, which seems to cover most use cases, but one:
> when the user issues the Copy command, the contents of the clipboard change,
> and the editing caps potentially change with it (if the clipboard was empty,
> the PasteCapability becomes true). Emitting editingCapabilitiesChanged in
> WebView::executeEditingCommand() just after calling
> contents::WebContents::Copy() doesn’t do the trick, as copying content to the
> clipboard is async (and thus by the time the signal is emitted the content
> might not have been copied to the clipboard yet).
>
> In fact the problem is more general than that: if content is copied to the
> clipboard outside of the application, there’s no way to get notified of it and
> update the editing caps. There’s a comment in
> chrome/browser/ui/views/frame/browser_view.cc (above
> BrowserView::CutCopyPaste()) that suggests that this is currently not possible
> anyway.
>
> Is WebView.editingCapabilities a good idea after all?

We need some way of exposing this from WebView in order to support editing commands in an application menu. If possible, I'd like to not have this information duplicated in 3 different places (it's already exposed specifically for context menus).

Is the lack of notifications Chromium specific, or is that something we can get from Qt? (I'm not sure what QClipboard::dataChanged does)

[Olivier Tilloy (osomon)]

> Is the lack of notifications Chromium specific, or is that something
> we can get from Qt? (I'm not sure what QClipboard::dataChanged does)

It seems we can get the information from Qt. I just did a quick test with QClipboard (which is conveniently exposed in Qml by Ubuntu.Components, see https://developer.ubuntu.com/api/apps/qml/sdk-15.04/Ubuntu.Components.Clipboard/), and indeed the dataChanged signal is emitted whenever new data is being copied to the clipboard. Presumably, we can listen to this signal to emit editingCapabilitiesChanged. This also works when the application doesn’t have active focus.

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

1290. By Olivier Tilloy on 2015-12-08

Emit editingCapabilitiesChanged() when the contents of the clipboard change.

1291. By Olivier Tilloy on 2015-12-11

Merge the latest changes from trunk and resolve a couple of minor conflicts.

1292. By Olivier Tilloy on 2015-12-14

Cache the edit flags to avoid emitting a signal when they haven’t actually changed.

1293. By Olivier Tilloy on 2015-12-14

Add unit tests for the WebView.editingCapabilities API.

[Olivier Tilloy (osomon)]

I added unit tests for the WebView.editingCapabilities API. Some of them are partially commented out as they would fail because of bug #1524288.

[Chris Coulson (chrisccoulson)]

Sorry for taking ages on this - I've added some comments inline. I'm still going through it though, so there might be a few more later.

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

I've left another couple of comments

[Chris Coulson (chrisccoulson)]

Ok, I think I'm done for now (there's another couple of comments)

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

1294. By Olivier Tilloy on 2016-01-07

Merge the latest changes from trunk.

1295. By Olivier Tilloy on 2016-01-07

Disconnect all signal handlers in oxide::qt::BrowserPlatformIntegration’s destructor.

1296. By Olivier Tilloy on 2016-01-07

Use RenderWidgetHostViewContainer instead of having RWHV call into WebView directly.

1297. By Olivier Tilloy on 2016-01-07

Do not explicitly call reset() on scoped pointers in a destructor, this is happening at destruction anyway.

1298. By Olivier Tilloy on 2016-01-07

Ensure the edit flags are updated when the RWHV changes.

1299. By Olivier Tilloy on 2016-01-07

Pass the bounds by const reference instead of by value.

1300. By Olivier Tilloy on 2016-01-07

Clear the edit flags if there’s no RWHV.

1301. By Olivier Tilloy on 2016-01-07

Factor out code in a helper function.

1302. By Olivier Tilloy on 2016-01-08

Remove the base oxide::TouchHandleDrawable implementation, and oxide::TouchHandleDrawableDelegate.
This was one layer too many for no good reason.

1303. By Olivier Tilloy on 2016-01-08

Merge the latest changes from trunk.

1304. By Olivier Tilloy on 2016-01-08

Fix a regression with vertical positioning of handles that crept in a previous commit.

1305. By Olivier Tilloy on 2016-01-08

Update copyright years in headers of changed files.

1306. By Olivier Tilloy on 2016-01-08

Remove explicit disconnections in destructor, which are handled automatically by QObject.

1307. By Olivier Tilloy on 2016-01-08

onTouchSelectionChanged doesn’t need to be a slot.

1308. By Olivier Tilloy on 2016-01-08

Move the pointer to the touch selection handle to OxideQQuickTouchSelectionControllerPrivate.

1309. By Olivier Tilloy on 2016-01-08

Make RWHV an implementation of ui::TouchSelectionControllreClient, instead of proxying calls to a separate object.

[Olivier Tilloy (osomon)]

Thanks for the thorough review. I think I addressed all your comments.

[Chris Coulson (chrisccoulson)]

This looks fine to merge now - I'll probably report a few follow up bugs with other cleanups / suggestions, but those don't need to block the initial landing

review: Approve

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

1310. By Olivier Tilloy on 2016-01-12

Merge the latest changes from trunk and resolve a minor conflict.

=== modified file 'qt/core/browser/oxide_qt_browser_platform_integration.cc'
--- qt/core/browser/oxide_qt_browser_platform_integration.cc	2015-11-27 21:35:14 +0000
+++ qt/core/browser/oxide_qt_browser_platform_integration.cc	2016-01-08 22:47:28 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2014-2015 Canonical Ltd.
+// Copyright (C) 2014-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
@@ -17,6 +17,7 @@
 
 #include "oxide_qt_browser_platform_integration.h"
 
+#include <QClipboard>
 #include <QDesktopServices>
 #include <QEvent>
 #include <QGuiApplication>
@@ -80,6 +81,10 @@
   UpdateApplicationState();
 }
 
+void BrowserPlatformIntegration::OnClipboardDataChanged() {
+  NotifyClipboardDataChanged();
+}
+
 void BrowserPlatformIntegration::OnScreenGeometryChanged(
     const QRect& geometry) {
   UpdateDefaultScreenInfo();
@@ -226,14 +231,14 @@
 
   connect(qApp, SIGNAL(applicationStateChanged(Qt::ApplicationState)),
           SLOT(OnApplicationStateChanged()));
+  connect(QGuiApplication::clipboard(), SIGNAL(dataChanged()),
+          SLOT(OnClipboardDataChanged()));
   if (QGuiApplication::platformName().startsWith("ubuntu")) {
     qApp->installEventFilter(this);
   }
-
 }
 
 BrowserPlatformIntegration::~BrowserPlatformIntegration() {
-  qApp->disconnect(this);
   qApp->removeEventFilter(this);
 }
 

=== modified file 'qt/core/browser/oxide_qt_browser_platform_integration.h'
--- qt/core/browser/oxide_qt_browser_platform_integration.h	2015-11-27 21:35:14 +0000
+++ qt/core/browser/oxide_qt_browser_platform_integration.h	2016-01-08 22:47:28 +0000
@@ -44,6 +44,7 @@
 
  private Q_SLOTS:
   void OnApplicationStateChanged();
+  void OnClipboardDataChanged();
   void OnScreenGeometryChanged(const QRect& geometry);
   void OnScreenOrientationChanged(Qt::ScreenOrientation orientation);
 

=== added file 'qt/core/browser/oxide_qt_touch_handle_drawable.cc'
--- qt/core/browser/oxide_qt_touch_handle_drawable.cc	1970-01-01 00:00:00 +0000
+++ qt/core/browser/oxide_qt_touch_handle_drawable.cc	2016-01-08 22:47:28 +0000
@@ -0,0 +1,105 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015-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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "oxide_qt_touch_handle_drawable.h"
+
+#include "qt/core/glue/oxide_qt_touch_handle_drawable_proxy.h"
+
+#include "oxide_qt_web_view.h"
+
+#include <QPointF>
+
+namespace oxide {
+namespace qt {
+
+TouchHandleDrawable::TouchHandleDrawable(const WebView* view)
+    : view_(view) {}
+
+TouchHandleDrawable::~TouchHandleDrawable() {}
+
+void TouchHandleDrawable::SetProxy(TouchHandleDrawableProxy* proxy) {
+  proxy_.reset(proxy);
+}
+
+void TouchHandleDrawable::SetEnabled(bool enabled) {
+  if (proxy_) {
+    proxy_->SetEnabled(enabled);
+  }
+}
+
+void TouchHandleDrawable::SetOrientation(
+    ui::TouchHandleOrientation orientation,
+    bool mirror_vertical,
+    bool mirror_horizontal) {
+  if (proxy_) {
+    TouchHandleDrawableProxy::Orientation o;
+    switch (orientation) {
+      case ui::TouchHandleOrientation::LEFT:
+        o = TouchHandleDrawableProxy::Left;
+        break;
+      case ui::TouchHandleOrientation::CENTER:
+        o = TouchHandleDrawableProxy::Center;
+        break;
+      case ui::TouchHandleOrientation::RIGHT:
+        o = TouchHandleDrawableProxy::Right;
+        break;
+      case ui::TouchHandleOrientation::UNDEFINED:
+        o = TouchHandleDrawableProxy::Undefined;
+        break;
+      default:
+        Q_UNREACHABLE();
+    }
+    proxy_->SetOrientation(o, mirror_vertical, mirror_horizontal);
+  }
+}
+
+void TouchHandleDrawable::SetOrigin(const gfx::PointF& origin) {
+  if (proxy_) {
+    const float dpr = view_->GetDeviceScaleFactor();
+    const int y_offset = view_->GetLocationBarContentOffsetPix();
+    proxy_->SetOrigin(QPointF(origin.x() * dpr, origin.y() * dpr + y_offset));
+  }
+}
+
+void TouchHandleDrawable::SetAlpha(float alpha) {
+  if (proxy_) {
+    proxy_->SetAlpha(alpha);
+  }
+}
+
+gfx::RectF TouchHandleDrawable::GetVisibleBounds() const {
+  if (!proxy_) {
+    return gfx::RectF();
+  }
+
+  const float dpr = view_->GetDeviceScaleFactor();
+  const int y_offset = view_->GetLocationBarContentOffsetPix();
+  QRectF bounds = proxy_->GetVisibleBounds();
+  return gfx::RectF(bounds.x() / dpr, (bounds.y() - y_offset) / dpr,
+                    bounds.width() / dpr, bounds.height() / dpr);
+}
+
+float TouchHandleDrawable::GetDrawableHorizontalPaddingRatio() const {
+  if (!proxy_) {
+    return 0.0f;
+  }
+
+  return proxy_->GetDrawableHorizontalPaddingRatio();
+}
+
+} // namespace qt
+} // namespace oxide

=== added file 'qt/core/browser/oxide_qt_touch_handle_drawable.h'
--- qt/core/browser/oxide_qt_touch_handle_drawable.h	1970-01-01 00:00:00 +0000
+++ qt/core/browser/oxide_qt_touch_handle_drawable.h	2016-01-08 22:47:28 +0000
@@ -0,0 +1,56 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015-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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_QT_CORE_BROWSER_TOUCH_HANDLE_DRAWABLE_H_
+#define _OXIDE_QT_CORE_BROWSER_TOUCH_HANDLE_DRAWABLE_H_
+
+#include "base/memory/scoped_ptr.h"
+#include "ui/touch_selection/touch_handle.h"
+
+namespace oxide {
+namespace qt {
+
+class TouchHandleDrawableProxy;
+class WebView;
+
+class TouchHandleDrawable : public ui::TouchHandleDrawable {
+ public:
+  TouchHandleDrawable(const WebView* view);
+
+  void SetProxy(TouchHandleDrawableProxy* proxy);
+
+ private:
+  ~TouchHandleDrawable() override;
+
+  // ui::TouchHandleDrawable implementation
+  void SetEnabled(bool enabled) override;
+  void SetOrientation(ui::TouchHandleOrientation orientation,
+                      bool mirror_vertical,
+                      bool mirror_horizontal) override;
+  void SetOrigin(const gfx::PointF& origin) override;
+  void SetAlpha(float alpha) override;
+  gfx::RectF GetVisibleBounds() const override;
+  float GetDrawableHorizontalPaddingRatio() const override;
+
+  scoped_ptr<TouchHandleDrawableProxy> proxy_;
+  const WebView* view_;
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_BROWSER_TOUCH_HANDLE_DRAWABLE_H_

=== modified file 'qt/core/browser/oxide_qt_web_context_menu.cc'
--- qt/core/browser/oxide_qt_web_context_menu.cc	2015-08-31 10:57:08 +0000
+++ qt/core/browser/oxide_qt_web_context_menu.cc	2016-01-08 22:47:28 +0000
@@ -24,6 +24,7 @@
 #include "base/strings/utf_string_conversions.h"
 
 #include "qt/core/glue/oxide_qt_web_context_menu_proxy.h"
+#include "qt/core/glue/oxide_qt_web_view_proxy.h"
 #include "shared/browser/oxide_web_view.h"
 
 namespace oxide {

=== modified file 'qt/core/browser/oxide_qt_web_view.cc'
--- qt/core/browser/oxide_qt_web_view.cc	2016-01-04 13:40:25 +0000
+++ qt/core/browser/oxide_qt_web_view.cc	2016-01-08 22:47:28 +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
@@ -50,7 +50,9 @@
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/size.h"
+#include "ui/touch_selection/touch_selection_controller.h"
 #include "url/gurl.h"
 
 #include "qt/core/api/oxideqdownloadrequest.h"
@@ -92,6 +94,7 @@
 #include "oxide_qt_screen_utils.h"
 #include "oxide_qt_script_message_handler.h"
 #include "oxide_qt_skutils.h"
+#include "oxide_qt_touch_handle_drawable.h"
 #include "oxide_qt_web_context.h"
 #include "oxide_qt_web_context_menu.h"
 #include "oxide_qt_web_frame.h"
@@ -411,6 +414,10 @@
   return GetDeviceScaleFactorFromQScreen(screen);
 }
 
+int WebView::GetLocationBarContentOffsetPix() const {
+  return locationBarContentOffsetPix();
+}
+
 void WebView::CommonInit(OxideQFindController* find_controller) {
   content::WebContents* contents = view_->GetWebContents();
 
@@ -819,6 +826,22 @@
   return picker;
 }
 
+ui::TouchHandleDrawable* WebView::CreateTouchHandleDrawable() const {
+  TouchHandleDrawable* drawable = new TouchHandleDrawable(this);
+  drawable->SetProxy(client_->CreateTouchHandleDrawable());
+  return drawable;
+}
+
+OXIDE_MAKE_ENUM_BITWISE_OPERATORS(EditCapabilityFlags)
+
+void WebView::TouchSelectionChanged(bool active,
+                                    const gfx::RectF& bounds) const {
+  const float dpr = GetDeviceScaleFactor();
+  QRectF rect(bounds.x() * dpr, bounds.y() * dpr,
+              bounds.width() * dpr, bounds.height() * dpr);
+  client_->TouchSelectionChanged(active, rect);
+}
+
 void WebView::SwapCompositorFrame() {
   compositor_frame_.reset();
   client_->ScheduleUpdate();
@@ -878,6 +901,10 @@
   client_->TargetURLChanged();
 }
 
+void WebView::OnEditingCapabilitiesChanged() {
+  client_->OnEditingCapabilitiesChanged();
+}
+
 size_t WebView::GetScriptMessageHandlerCount() const {
   return message_handlers_.size();
 }
@@ -1277,7 +1304,7 @@
   view_->PrepareToClose();
 }
 
-int WebView::locationBarHeight() {
+int WebView::locationBarHeight() const {
   return view_->GetLocationBarHeightPix();
 }
 
@@ -1285,11 +1312,11 @@
   view_->SetLocationBarHeightPix(height);
 }
 
-int WebView::locationBarOffsetPix() {
+int WebView::locationBarOffsetPix() const {
   return view_->GetLocationBarOffsetPix();
 }
 
-int WebView::locationBarContentOffsetPix() {
+int WebView::locationBarContentOffsetPix() const {
   return view_->GetLocationBarContentOffsetPix();
 }
 
@@ -1368,6 +1395,33 @@
   return QUrl(QString::fromStdString(view_->target_url().spec()));
 }
 
+EditCapabilityFlags WebView::editFlags() const {
+  EditCapabilityFlags capabilities = NO_CAPABILITY;
+  int flags = view_->GetEditFlags();
+  if (flags & blink::WebContextMenuData::CanUndo) {
+    capabilities |= UNDO_CAPABILITY;
+  }
+  if (flags & blink::WebContextMenuData::CanRedo) {
+    capabilities |= REDO_CAPABILITY;
+  }
+  if (flags & blink::WebContextMenuData::CanCut) {
+    capabilities |= CUT_CAPABILITY;
+  }
+  if (flags & blink::WebContextMenuData::CanCopy) {
+    capabilities |= COPY_CAPABILITY;
+  }
+  if (flags & blink::WebContextMenuData::CanPaste) {
+    capabilities |= PASTE_CAPABILITY;
+  }
+  if (flags & blink::WebContextMenuData::CanDelete) {
+    capabilities |= ERASE_CAPABILITY;
+  }
+  if (flags & blink::WebContextMenuData::CanSelectAll) {
+    capabilities |= SELECT_ALL_CAPABILITY;
+  }
+  return capabilities;
+}
+
 void WebView::teardownFrameTree() {
   DCHECK(!frame_tree_torn_down_);
 

=== modified file 'qt/core/browser/oxide_qt_web_view.h'
--- qt/core/browser/oxide_qt_web_view.h	2015-11-23 17:58:35 +0000
+++ qt/core/browser/oxide_qt_web_view.h	2016-01-08 22:47:28 +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
@@ -86,12 +86,13 @@
 
   const oxide::SecurityStatus& GetSecurityStatus() const;
 
+  float GetDeviceScaleFactor() const;
+  int GetLocationBarContentOffsetPix() const;
+
  private:
   WebView(WebViewProxyClient* client,
           OxideQSecurityStatus* security_status);
 
-  float GetDeviceScaleFactor() const;
-
   void CommonInit(OxideQFindController* find_controller);
 
   void EnsurePreferences();
@@ -150,7 +151,6 @@
       const std::string& user_agent) override;
   void HttpAuthenticationRequested(
       ResourceDispatcherHostLoginDelegate* login_delegate) override;
-
   bool ShouldHandleNavigation(const GURL& url,
                               WindowOpenDisposition disposition,
                               bool user_gesture) override;
@@ -163,6 +163,9 @@
       WindowOpenDisposition disposition,
       scoped_ptr<content::WebContents> contents) override;
   oxide::FilePicker* CreateFilePicker(content::RenderViewHost* rvh) override;
+  ui::TouchHandleDrawable* CreateTouchHandleDrawable() const override;
+  void TouchSelectionChanged(bool active,
+                             const gfx::RectF& bounds) const override;
   void SwapCompositorFrame() override;
   void EvictCurrentFrame() override;
   oxide::InputMethodContext* GetInputMethodContext() const override;
@@ -172,6 +175,7 @@
   void PrepareToCloseResponseReceived(bool proceed) override;
   void CloseRequested() override;
   void TargetURLChanged() override;
+  void OnEditingCapabilitiesChanged() override;
 
   // oxide::ScriptMessageTarget implementation
   size_t GetScriptMessageHandlerCount() const override;
@@ -271,10 +275,10 @@
 
   void prepareToClose() override;
 
-  int locationBarHeight() override;
+  int locationBarHeight() const override;
   void setLocationBarHeight(int height) override;
-  int locationBarOffsetPix() override;
-  int locationBarContentOffsetPix() override;
+  int locationBarOffsetPix() const override;
+  int locationBarContentOffsetPix() const override;
   LocationBarMode locationBarMode() const override;
   void setLocationBarMode(LocationBarMode mode) override;
   bool locationBarAnimated() const override;
@@ -288,6 +292,8 @@
 
   QUrl targetUrl() const override;
 
+  EditCapabilityFlags editFlags() const override;
+
   void teardownFrameTree() override;
 
   // This must outlive |view_|

=== modified file 'qt/core/core.gyp'
--- qt/core/core.gyp	2015-12-22 20:59:56 +0000
+++ qt/core/core.gyp	2016-01-08 22:47:28 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2013 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
@@ -148,6 +148,8 @@
         'browser/oxide_qt_script_message_request.h',
         'browser/oxide_qt_skutils.cc',
         'browser/oxide_qt_skutils.h',
+        'browser/oxide_qt_touch_handle_drawable.cc',
+        'browser/oxide_qt_touch_handle_drawable.h',
         'browser/oxide_qt_url_request_delegated_job.cc',
         'browser/oxide_qt_url_request_delegated_job.h',
         'browser/oxide_qt_user_script.cc',
@@ -180,6 +182,7 @@
         'glue/oxide_qt_script_message_request_proxy.cc',
         'glue/oxide_qt_script_message_request_proxy.h',
         'glue/oxide_qt_script_message_request_proxy_client.h',
+        'glue/oxide_qt_touch_handle_drawable_proxy.h',
         'glue/oxide_qt_user_script_proxy.cc',
         'glue/oxide_qt_user_script_proxy.h',
         'glue/oxide_qt_user_script_proxy_client.h',

=== added file 'qt/core/glue/oxide_qt_touch_handle_drawable_proxy.h'
--- qt/core/glue/oxide_qt_touch_handle_drawable_proxy.h	1970-01-01 00:00:00 +0000
+++ qt/core/glue/oxide_qt_touch_handle_drawable_proxy.h	2016-01-08 22:47:28 +0000
@@ -0,0 +1,56 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015-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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_QT_CORE_GLUE_TOUCH_HANDLE_DRAWABLE_PROXY_H_
+#define _OXIDE_QT_CORE_GLUE_TOUCH_HANDLE_DRAWABLE_PROXY_H_
+
+#include <QRectF>
+#include <QtGlobal>
+
+QT_BEGIN_NAMESPACE
+class QPointF;
+QT_END_NAMESPACE
+
+namespace oxide {
+namespace qt {
+
+class TouchHandleDrawableProxy {
+ public:
+  // Matches chromium’s ui::TouchHandleOrientation
+  enum Orientation {
+    Left,
+    Center,
+    Right,
+    Undefined,
+  };
+
+  virtual ~TouchHandleDrawableProxy() {}
+
+  virtual void SetEnabled(bool enabled) = 0;
+  virtual void SetOrientation(Orientation orientation,
+                              bool mirror_vertical,
+                              bool mirror_horizontal) = 0;
+  virtual void SetOrigin(const QPointF& origin) = 0;
+  virtual void SetAlpha(float alpha) = 0;
+  virtual QRectF GetVisibleBounds() const = 0;
+  virtual float GetDrawableHorizontalPaddingRatio() const = 0;
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_GLUE_TOUCH_HANDLE_DRAWABLE_PROXY_H_

=== modified file 'qt/core/glue/oxide_qt_web_context_menu_proxy_client.h'
--- qt/core/glue/oxide_qt_web_context_menu_proxy_client.h	2015-05-28 23:51:39 +0000
+++ qt/core/glue/oxide_qt_web_context_menu_proxy_client.h	2016-01-08 22:47:28 +0000
@@ -26,17 +26,6 @@
 namespace oxide {
 namespace qt {
 
-enum EditCapabilityFlags {
-  NO_CAPABILITY = 0,
-  UNDO_CAPABILITY = 1 << 0,
-  REDO_CAPABILITY = 1 << 1,
-  CUT_CAPABILITY = 1 << 2,
-  COPY_CAPABILITY = 1 << 3,
-  PASTE_CAPABILITY = 1 << 4,
-  ERASE_CAPABILITY = 1 << 5,
-  SELECT_ALL_CAPABILITY = 1 << 6
-};
-
 enum MediaType {
   MEDIA_TYPE_NONE,
   MEDIA_TYPE_IMAGE,

=== modified file 'qt/core/glue/oxide_qt_web_view_proxy.h'
--- qt/core/glue/oxide_qt_web_view_proxy.h	2015-11-23 17:58:35 +0000
+++ qt/core/glue/oxide_qt_web_view_proxy.h	2016-01-08 22:47:28 +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
@@ -49,6 +49,7 @@
 class OxideQFindController;
 class OxideQNewViewRequest;
 class OxideQSecurityStatus;
+class OxideQTouchSelectionController;
 class OxideQWebPreferences;
 
 namespace oxide {
@@ -84,6 +85,17 @@
   WEB_PROCESS_CRASHED
 };
 
+enum EditCapabilityFlags {
+  NO_CAPABILITY = 0,
+  UNDO_CAPABILITY = 1 << 0,
+  REDO_CAPABILITY = 1 << 1,
+  CUT_CAPABILITY = 1 << 2,
+  COPY_CAPABILITY = 1 << 3,
+  PASTE_CAPABILITY = 1 << 4,
+  ERASE_CAPABILITY = 1 << 5,
+  SELECT_ALL_CAPABILITY = 1 << 6
+};
+
 enum EditingCommands {
   EDITING_COMMAND_UNDO,
   EDITING_COMMAND_REDO,
@@ -222,10 +234,10 @@
 
   virtual void prepareToClose() = 0;
 
-  virtual int locationBarHeight() = 0;
+  virtual int locationBarHeight() const = 0;
   virtual void setLocationBarHeight(int height) = 0;
-  virtual int locationBarOffsetPix() = 0;
-  virtual int locationBarContentOffsetPix() = 0;
+  virtual int locationBarOffsetPix() const = 0;
+  virtual int locationBarContentOffsetPix() const = 0;
   virtual LocationBarMode locationBarMode() const = 0;
   virtual void setLocationBarMode(LocationBarMode mode) = 0;
   virtual bool locationBarAnimated() const = 0;
@@ -239,6 +251,8 @@
 
   virtual QUrl targetUrl() const = 0;
 
+  virtual EditCapabilityFlags editFlags() const = 0;
+
   virtual void teardownFrameTree() = 0;
 };
 

=== modified file 'qt/core/glue/oxide_qt_web_view_proxy_client.h'
--- qt/core/glue/oxide_qt_web_view_proxy_client.h	2015-11-23 17:58:35 +0000
+++ qt/core/glue/oxide_qt_web_view_proxy_client.h	2016-01-08 22:47:28 +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
@@ -19,6 +19,7 @@
 #define _OXIDE_QT_CORE_GLUE_WEB_VIEW_PROXY_CLIENT_H_
 
 #include <QRect>
+#include <QRectF>
 #include <QtGlobal>
 
 #include "qt/core/glue/oxide_qt_javascript_dialog_proxy_client.h"
@@ -48,6 +49,7 @@
 class FilePickerProxy;
 class FilePickerProxyClient;
 class JavaScriptDialogProxy;
+class TouchHandleDrawableProxy;
 class WebContextMenuProxy;
 class WebContextMenuProxyClient;
 class WebFrameProxy;
@@ -82,6 +84,7 @@
   virtual JavaScriptDialogProxy* CreateBeforeUnloadDialog(
       JavaScriptDialogProxyClient* client) = 0;
   virtual FilePickerProxy* CreateFilePicker(FilePickerProxyClient* client) = 0;
+  virtual TouchHandleDrawableProxy* CreateTouchHandleDrawable() = 0;
 
   virtual void WebProcessStatusChanged() = 0;
 
@@ -97,6 +100,8 @@
   virtual void NavigationListPruned(bool from_front, int count) = 0;
   virtual void NavigationEntryChanged(int index) = 0;
 
+  virtual void TouchSelectionChanged(bool active, QRectF bounds) = 0;
+
   virtual void CreateWebFrame(WebFrameProxy* proxy) = 0;
 
   virtual QScreen* GetScreen() const = 0;
@@ -151,6 +156,8 @@
   virtual void CloseRequested() = 0;
 
   virtual void TargetURLChanged() = 0;
+  
+  virtual void OnEditingCapabilitiesChanged() = 0;
 };
 
 } // namespace qt

=== modified file 'qt/qmlplugin/oxide.qmltypes'
--- qt/qmlplugin/oxide.qmltypes	2015-11-16 14:29:31 +0000
+++ qt/qmlplugin/oxide.qmltypes	2016-01-08 22:47:28 +0000
@@ -290,6 +290,25 @@
         Signal { name: "errorCallbackChanged" }
     }
     Component {
+        name: "OxideQQuickTouchSelectionController"
+        prototype: "QObject"
+        exports: ["TouchSelectionController 1.12"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "HandleOrientation"
+            values: {
+                "HandleOrientationLeft": 0,
+                "HandleOrientationCenter": 1,
+                "HandleOrientationRight": 2,
+                "HandleOrientationUndefined": 3
+            }
+        }
+        Property { name: "active"; type: "bool"; isReadonly: true }
+        Property { name: "handle"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "bounds"; type: "QRectF"; isReadonly: true }
+    }
+    Component {
         name: "OxideQQuickUserScript"
         prototype: "QObject"
         exports: ["UserScript 1.0"]
@@ -620,6 +639,14 @@
         }
         Property { name: "webProcessStatus"; revision: 4; type: "WebProcessStatus"; isReadonly: true }
         Property { name: "hoveredUrl"; type: "QUrl"; isReadonly: true }
+        Property {
+            name: "touchSelectionController"
+            revision: 7
+            type: "OxideQQuickTouchSelectionController"
+            isReadonly: true
+            isPointer: true
+        }
+        Property { name: "editingCapabilities"; revision: 7; type: "EditCapabilities"; isReadonly: true }
         Signal { name: "loadingStateChanged"; revision: 1 }
         Signal {
             name: "loadEvent"
@@ -689,6 +716,7 @@
             Parameter { name: "request"; type: "QJSValue" }
         }
         Signal { name: "hoveredUrlChanged"; revision: 7 }
+        Signal { name: "editingCapabilitiesChanged"; revision: 7 }
         Signal {
             name: "loadingChanged"
             Parameter { name: "loadEvent"; type: "OxideQLoadEvent" }

=== modified file 'qt/qmlplugin/oxide_qml_plugin.cc'
--- qt/qmlplugin/oxide_qml_plugin.cc	2015-11-16 12:15:21 +0000
+++ qt/qmlplugin/oxide_qml_plugin.cc	2016-01-08 22:47:28 +0000
@@ -40,6 +40,7 @@
 #include "qt/quick/api/oxideqquickscriptmessage_p.h"
 #include "qt/quick/api/oxideqquickscriptmessagehandler_p.h"
 #include "qt/quick/api/oxideqquickscriptmessagerequest_p.h"
+#include "qt/quick/api/oxideqquicktouchselectioncontroller_p.h"
 #include "qt/quick/api/oxideqquickuserscript_p.h"
 #include "qt/quick/api/oxideqquickwebcontext_p.h"
 #include "qt/quick/api/oxideqquickwebcontextdelegateworker_p.h"
@@ -163,6 +164,8 @@
 
     qmlRegisterType<OxideQQuickWebView, 6>(uri, 1, 11, "WebView");
 
+    qmlRegisterUncreatableType<OxideQQuickTouchSelectionController>(uri, 1, 12, "TouchSelectionController",
+        "TouchSelectionController is accessed via WebView.touchSelectionController");
     qmlRegisterType<OxideQQuickWebView, 7>(uri, 1, 12, "WebView");
   }
 };

=== modified file 'qt/quick/CMakeLists.txt'
--- qt/quick/CMakeLists.txt	2015-07-02 18:18:25 +0000
+++ qt/quick/CMakeLists.txt	2016-01-08 22:47:28 +0000
@@ -1,6 +1,6 @@
 # vim:expandtab:shiftwidth=2:tabstop=2:
 
-# Copyright (C) 2014-2015 Canonical Ltd.
+# Copyright (C) 2014-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
@@ -34,6 +34,7 @@
     api/oxideqquickscriptmessage.cc
     api/oxideqquickscriptmessagehandler.cc
     api/oxideqquickscriptmessagerequest.cc
+    api/oxideqquicktouchselectioncontroller.cc
     api/oxideqquickuserscript.cc
     api/oxideqquickwebcontext.cc
     api/oxideqquickwebcontextdelegateworker.cc
@@ -50,6 +51,7 @@
     oxide_qquick_javascript_dialog.cc
     oxide_qquick_prompt_dialog.cc
     oxide_qquick_software_frame_node.cc
+    oxide_qquick_touch_handle_drawable.cc
     oxide_qquick_web_context_menu.cc
     oxide_qquick_web_popup_menu.cc
     ${MOC_EXTRA})

=== added file 'qt/quick/api/oxideqquicktouchselectioncontroller.cc'
--- qt/quick/api/oxideqquicktouchselectioncontroller.cc	1970-01-01 00:00:00 +0000
+++ qt/quick/api/oxideqquicktouchselectioncontroller.cc	2016-01-08 22:47:28 +0000
@@ -0,0 +1,92 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015-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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "oxideqquicktouchselectioncontroller_p.h"
+
+#include "oxideqquickwebview_p_p.h"
+
+QT_BEGIN_NAMESPACE
+class QQmlComponent;
+QT_END_NAMESPACE
+
+class OxideQQuickTouchSelectionControllerPrivate {
+ public:
+  OxideQQuickTouchSelectionControllerPrivate()
+      : view(nullptr)
+      , handle(nullptr)
+      , active(false) {}
+
+  OxideQQuickWebView* view;
+  QQmlComponent* handle;
+  bool active;
+  QRectF bounds;
+};
+
+OxideQQuickTouchSelectionController::OxideQQuickTouchSelectionController(
+    OxideQQuickWebView* view)
+    : d_ptr(new OxideQQuickTouchSelectionControllerPrivate()) {
+  Q_D(OxideQQuickTouchSelectionController);
+
+  d->view = view;
+}
+
+OxideQQuickTouchSelectionController::~OxideQQuickTouchSelectionController() {}
+
+bool OxideQQuickTouchSelectionController::active() const {
+  Q_D(const OxideQQuickTouchSelectionController);
+
+  return d->active;
+}
+
+QQmlComponent* OxideQQuickTouchSelectionController::handle() const {
+  Q_D(const OxideQQuickTouchSelectionController);
+
+  return d->handle;
+}
+
+void OxideQQuickTouchSelectionController::setHandle(QQmlComponent* handle) {
+  Q_D(OxideQQuickTouchSelectionController);
+
+  if (handle == d->handle) {
+    return;
+  }
+
+  d->handle = handle;
+  Q_EMIT handleChanged();
+}
+
+const QRectF& OxideQQuickTouchSelectionController::bounds() const {
+  Q_D(const OxideQQuickTouchSelectionController);
+
+  return d->bounds;
+}
+
+void OxideQQuickTouchSelectionController::onTouchSelectionChanged(
+    bool active,
+    const QRectF& bounds) {
+  Q_D(OxideQQuickTouchSelectionController);
+
+  if (active != d->active) {
+    d->active = active;
+    Q_EMIT activeChanged();
+  }
+
+  if (bounds != d->bounds) {
+    d->bounds = bounds;
+    Q_EMIT boundsChanged();
+  }
+}

=== added file 'qt/quick/api/oxideqquicktouchselectioncontroller_p.h'
--- qt/quick/api/oxideqquicktouchselectioncontroller_p.h	1970-01-01 00:00:00 +0000
+++ qt/quick/api/oxideqquicktouchselectioncontroller_p.h	2016-01-08 22:47:28 +0000
@@ -0,0 +1,74 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015-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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_QT_QUICK_API_TOUCH_SELECTION_CONTROLLER_H_
+#define _OXIDE_QT_QUICK_API_TOUCH_SELECTION_CONTROLLER_H_
+
+#include <QObject>
+#include <QRectF>
+#include <QString>
+#include <QtGlobal>
+
+#include "oxideqquickwebview_p.h"
+
+class QQmlComponent;
+
+class OxideQQuickTouchSelectionControllerPrivate;
+
+class Q_DECL_EXPORT OxideQQuickTouchSelectionController : public QObject {
+  Q_OBJECT
+
+  Q_ENUMS(HandleOrientation);
+
+  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_DISABLE_COPY(OxideQQuickTouchSelectionController)
+  Q_DECLARE_PRIVATE(OxideQQuickTouchSelectionController)
+
+ public:
+  Q_DECL_HIDDEN OxideQQuickTouchSelectionController(OxideQQuickWebView* view);
+  virtual ~OxideQQuickTouchSelectionController();
+
+  enum HandleOrientation {
+    HandleOrientationLeft,
+    HandleOrientationCenter,
+    HandleOrientationRight,
+    HandleOrientationUndefined
+  };
+
+  bool active() const;
+
+  QQmlComponent* handle() const;
+  void setHandle(QQmlComponent* handle);
+
+  const QRectF& bounds() const;
+
+ Q_SIGNALS:
+  void activeChanged();
+  void handleChanged();
+  void boundsChanged();
+
+ private:
+  friend class OxideQQuickWebViewPrivate;
+  void onTouchSelectionChanged(bool active, const QRectF& bounds);
+
+  QScopedPointer<OxideQQuickTouchSelectionControllerPrivate> d_ptr;
+};
+
+#endif // _OXIDE_QT_QUICK_API_TOUCH_SELECTION_CONTROLLER_H_

=== modified file 'qt/quick/api/oxideqquickwebview.cc'
--- qt/quick/api/oxideqquickwebview.cc	2015-11-23 18:06:19 +0000
+++ qt/quick/api/oxideqquickwebview.cc	2016-01-08 22:47:28 +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
@@ -57,12 +57,14 @@
 #include "qt/quick/oxide_qquick_init.h"
 #include "qt/quick/oxide_qquick_prompt_dialog.h"
 #include "qt/quick/oxide_qquick_software_frame_node.h"
+#include "qt/quick/oxide_qquick_touch_handle_drawable.h"
 #include "qt/quick/oxide_qquick_web_context_menu.h"
 #include "qt/quick/oxide_qquick_web_popup_menu.h"
 
 #include "oxideqquicklocationbarcontroller_p.h"
 #include "oxideqquickscriptmessagehandler_p.h"
 #include "oxideqquickscriptmessagehandler_p_p.h"
+#include "oxideqquicktouchselectioncontroller_p.h"
 #include "oxideqquickwebcontext_p.h"
 #include "oxideqquickwebcontext_p_p.h"
 #include "oxideqquickwebframe_p.h"
@@ -214,6 +216,13 @@
   return new oxide::qquick::FilePicker(q, client);
 }
 
+oxide::qt::TouchHandleDrawableProxy*
+OxideQQuickWebViewPrivate::CreateTouchHandleDrawable() {
+  Q_Q(OxideQQuickWebView);
+
+  return new oxide::qquick::TouchHandleDrawable(q);
+}
+
 void OxideQQuickWebViewPrivate::WebProcessStatusChanged() {
   Q_Q(OxideQQuickWebView);
 
@@ -284,6 +293,13 @@
   navigation_history_.onNavigationEntryChanged(index);
 }
 
+void OxideQQuickWebViewPrivate::TouchSelectionChanged(bool active,
+                                                      QRectF bounds) {
+  Q_Q(OxideQQuickWebView);
+
+  q->touchSelectionController()->onTouchSelectionChanged(active, bounds);
+}
+
 void OxideQQuickWebViewPrivate::CreateWebFrame(
     oxide::qt::WebFrameProxy* proxy) {
   Q_Q(OxideQQuickWebView);
@@ -642,6 +658,12 @@
   emit q->hoveredUrlChanged();
 }
 
+void OxideQQuickWebViewPrivate::OnEditingCapabilitiesChanged() {
+  Q_Q(OxideQQuickWebView);
+
+  emit q->editingCapabilitiesChanged();
+}
+
 void OxideQQuickWebViewPrivate::completeConstruction() {
   Q_Q(OxideQQuickWebView);
 
@@ -2084,6 +2106,17 @@
   return d->proxy()->targetUrl();
 }
 
+OxideQQuickWebView::EditCapabilities OxideQQuickWebView::editingCapabilities() const {
+  Q_D(const OxideQQuickWebView);
+
+  if (!d->proxy()) {
+    return NoCapability;
+  }
+
+  oxide::qt::EditCapabilityFlags flags = d->proxy()->editFlags();
+  return static_cast<EditCapabilities>(flags);
+}
+
 // static
 OxideQQuickWebViewAttached* OxideQQuickWebView::qmlAttachedProperties(
     QObject* object) {
@@ -2214,4 +2247,15 @@
   return d->find_controller_.data();
 }
 
+OxideQQuickTouchSelectionController* OxideQQuickWebView::touchSelectionController() {
+  Q_D(OxideQQuickWebView);
+
+  if (!d->touch_selection_controller_) {
+    d->touch_selection_controller_.reset(
+        new OxideQQuickTouchSelectionController(this));
+  }
+
+  return d->touch_selection_controller_.data();
+}
+
 #include "moc_oxideqquickwebview_p.cpp"

=== modified file 'qt/quick/api/oxideqquickwebview_p.h'
--- qt/quick/api/oxideqquickwebview_p.h	2016-01-08 16:02:42 +0000
+++ qt/quick/api/oxideqquickwebview_p.h	2016-01-08 22:47:28 +0000
@@ -39,6 +39,7 @@
 class OxideQQuickLocationBarController;
 class OxideQQuickNavigationHistory;
 class OxideQQuickScriptMessageHandler;
+class OxideQQuickTouchSelectionController;
 class OxideQQuickWebContext;
 class OxideQQuickWebFrame;
 class OxideQQuickWebView;
@@ -133,6 +134,10 @@
 
   Q_PROPERTY(QUrl hoveredUrl READ hoveredUrl NOTIFY hoveredUrlChanged REVISION 7)
 
+  Q_PROPERTY(OxideQQuickTouchSelectionController* touchSelectionController READ touchSelectionController CONSTANT REVISION 7)
+
+  Q_PROPERTY(EditCapabilities editingCapabilities READ editingCapabilities NOTIFY editingCapabilitiesChanged REVISION 7)
+
   Q_DECLARE_PRIVATE(OxideQQuickWebView)
 
  public:
@@ -303,6 +308,10 @@
 
   Q_REVISION(4) Q_INVOKABLE void executeEditingCommand(EditingCommands command) const;
 
+  OxideQQuickTouchSelectionController* touchSelectionController();
+
+  EditCapabilities editingCapabilities() const;
+
  public Q_SLOTS:
   void goBack();
   void goForward();
@@ -362,6 +371,7 @@
   Q_REVISION(4) void webProcessStatusChanged();
   Q_REVISION(5) void httpAuthenticationRequested(const QJSValue& request);
   Q_REVISION(7) void hoveredUrlChanged();
+  Q_REVISION(7) void editingCapabilitiesChanged();
 
   // Deprecated since 1.3
   void loadingChanged(const OxideQLoadEvent& loadEvent);

=== modified file 'qt/quick/api/oxideqquickwebview_p_p.h'
--- qt/quick/api/oxideqquickwebview_p_p.h	2015-11-23 17:58:35 +0000
+++ qt/quick/api/oxideqquickwebview_p_p.h	2016-01-08 22:47:28 +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
@@ -33,6 +33,7 @@
 class OxideQNewViewRequest;
 class OxideQQuickLocationBarController;
 class OxideQQuickScriptMessageHandler;
+class OxideQQuickTouchSelectionController;
 class OxideQQuickWebContextPrivate;
 class OxideQQuickWebView;
 
@@ -94,6 +95,7 @@
       oxide::qt::JavaScriptDialogProxyClient* client) override;
   oxide::qt::FilePickerProxy* CreateFilePicker(
       oxide::qt::FilePickerProxyClient* client) override;
+  oxide::qt::TouchHandleDrawableProxy* CreateTouchHandleDrawable() override;
   void WebProcessStatusChanged() override;
   void URLChanged() override;
   void TitleChanged() override;
@@ -105,6 +107,7 @@
   void NavigationEntryCommitted() override;
   void NavigationListPruned(bool from_front, int count) override;
   void NavigationEntryChanged(int index) override;
+  void TouchSelectionChanged(bool active, QRectF bounds) override;
   void CreateWebFrame(oxide::qt::WebFrameProxy* proxy) override;
   QScreen* GetScreen() const override;
   QRect GetViewBoundsPix() const override;
@@ -143,6 +146,7 @@
   void PrepareToCloseResponse(bool proceed) override;
   void CloseRequested() override;
   void TargetURLChanged() override;
+  void OnEditingCapabilitiesChanged() override;
 
   oxide::qt::WebViewProxy* proxy() const {
     return oxide::qt::WebViewProxyHandle::proxy();
@@ -209,6 +213,8 @@
   QScopedPointer<ConstructProps> construct_props_;
 
   QScopedPointer<OxideQQuickLocationBarController> location_bar_controller_;
+
+  QScopedPointer<OxideQQuickTouchSelectionController> touch_selection_controller_;
 };
 
 #endif // _OXIDE_QT_QUICK_API_WEB_VIEW_P_P_H_

=== added file 'qt/quick/oxide_qquick_touch_handle_drawable.cc'
--- qt/quick/oxide_qquick_touch_handle_drawable.cc	1970-01-01 00:00:00 +0000
+++ qt/quick/oxide_qquick_touch_handle_drawable.cc	2016-01-08 22:47:28 +0000
@@ -0,0 +1,286 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015-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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "oxide_qquick_touch_handle_drawable.h"
+
+#include <QDebug>
+#include <QObject>
+#include <QQmlComponent>
+#include <QQmlContext>
+#include <QQmlEngine>
+#include <QQuickItem>
+
+#include "qt/quick/api/oxideqquicktouchselectioncontroller_p.h"
+#include "qt/quick/api/oxideqquickwebview_p.h"
+#include "qt/quick/api/oxideqquickwebview_p_p.h"
+
+namespace oxide {
+namespace qquick {
+
+class TouchHandleDrawableContext : public QObject {
+  Q_OBJECT
+  Q_PROPERTY(OxideQQuickTouchSelectionController::HandleOrientation orientation READ orientation NOTIFY orientationChanged FINAL)
+  Q_PROPERTY(bool mirrorVertical READ mirrorVertical NOTIFY mirrorVerticalChanged FINAL)
+  Q_PROPERTY(bool mirrorHorizontal READ mirrorHorizontal NOTIFY mirrorHorizontalChanged FINAL)
+  Q_PROPERTY(qreal horizontalPaddingRatio READ horizontalPaddingRatio WRITE setHorizontalPaddingRatio NOTIFY horizontalPaddingRatioChanged)
+
+ public:
+  virtual ~TouchHandleDrawableContext() {}
+  TouchHandleDrawableContext();
+
+  OxideQQuickTouchSelectionController::HandleOrientation orientation() const;
+  void setOrientation(
+      OxideQQuickTouchSelectionController::HandleOrientation orientation);
+
+  bool mirrorVertical() const;
+  void setMirrorVertical(bool mirror);
+
+  bool mirrorHorizontal() const;
+  void setMirrorHorizontal(bool mirror);
+
+  qreal horizontalPaddingRatio() const;
+  void setHorizontalPaddingRatio(qreal ratio);
+
+ Q_SIGNALS:
+  void orientationChanged() const;
+  void mirrorVerticalChanged() const;
+  void mirrorHorizontalChanged() const;
+  void horizontalPaddingRatioChanged() const;
+
+ private:
+  OxideQQuickTouchSelectionController::HandleOrientation orientation_;
+  bool mirror_vertical_;
+  bool mirror_horizontal_;
+  qreal horizontal_padding_ratio_;
+};
+
+TouchHandleDrawableContext::TouchHandleDrawableContext()
+    : orientation_(
+        OxideQQuickTouchSelectionController::HandleOrientationUndefined)
+    , mirror_vertical_(false)
+    , mirror_horizontal_(false)
+    , horizontal_padding_ratio_(0.0) {}
+
+OxideQQuickTouchSelectionController::HandleOrientation
+TouchHandleDrawableContext::orientation() const {
+  return orientation_;
+}
+
+void TouchHandleDrawableContext::setOrientation(
+    OxideQQuickTouchSelectionController::HandleOrientation orientation) {
+  if (orientation_ != orientation) {
+    orientation_ = orientation;
+    Q_EMIT orientationChanged();
+  }
+}
+
+bool TouchHandleDrawableContext::mirrorVertical() const {
+  return mirror_vertical_;
+}
+
+void TouchHandleDrawableContext::setMirrorVertical(bool mirror) {
+  if (mirror_vertical_ != mirror) {
+    mirror_vertical_ = mirror;
+    Q_EMIT mirrorVerticalChanged();
+  }
+}
+
+bool TouchHandleDrawableContext::mirrorHorizontal() const {
+  return mirror_horizontal_;
+}
+
+void TouchHandleDrawableContext::setMirrorHorizontal(bool mirror) {
+  if (mirror_horizontal_ != mirror) {
+    mirror_horizontal_ = mirror;
+    Q_EMIT mirrorHorizontalChanged();
+  }
+}
+
+qreal TouchHandleDrawableContext::horizontalPaddingRatio() const {
+  return horizontal_padding_ratio_;
+}
+
+void TouchHandleDrawableContext::setHorizontalPaddingRatio(qreal ratio) {
+  qreal bound = qBound(0.0, ratio, 1.0);
+  if (horizontal_padding_ratio_ != bound) {
+    horizontal_padding_ratio_ = bound;
+    Q_EMIT horizontalPaddingRatioChanged();
+  }
+}
+
+TouchHandleDrawable::~TouchHandleDrawable() {}
+
+void TouchHandleDrawable::SetEnabled(bool enabled) {
+  if (!item_.isNull()) {
+    item_->setVisible(enabled);
+  }
+}
+
+void TouchHandleDrawable::SetOrientation(Orientation orientation,
+                                         bool mirror_vertical,
+                                         bool mirror_horizontal) {
+  if (!context_.isNull()) {
+    TouchHandleDrawableContext* context =
+        qobject_cast<TouchHandleDrawableContext*>(context_->contextObject());
+    if (context) {
+      OxideQQuickTouchSelectionController::HandleOrientation o;
+      switch (orientation) {
+        case Orientation::Left:
+          o = OxideQQuickTouchSelectionController::HandleOrientationLeft;
+          break;
+        case Orientation::Center:
+          o = OxideQQuickTouchSelectionController::HandleOrientationCenter;
+          break;
+        case Orientation::Right:
+          o = OxideQQuickTouchSelectionController::HandleOrientationRight;
+          break;
+        case Orientation::Undefined:
+          o = OxideQQuickTouchSelectionController::HandleOrientationUndefined;
+          break;
+        default:
+          Q_UNREACHABLE();
+      }
+      context->setOrientation(o);
+      context->setMirrorVertical(mirror_vertical);
+      context->setMirrorHorizontal(mirror_horizontal);
+    }
+  }
+}
+
+void TouchHandleDrawable::SetOrigin(const QPointF& origin) {
+  if (!item_.isNull()) {
+    item_->setX(origin.x());
+    item_->setY(origin.y());
+  }
+}
+
+void TouchHandleDrawable::SetAlpha(float alpha) {
+  if (!item_.isNull()) {
+    item_->setOpacity(alpha);
+  }
+}
+
+QRectF TouchHandleDrawable::GetVisibleBounds() const {
+  if (item_.isNull()) {
+    return QRectF();
+  }
+
+  return QRectF(item_->x(), item_->y(), item_->width(), item_->height());
+}
+
+float TouchHandleDrawable::GetDrawableHorizontalPaddingRatio() const {
+  if (context_.isNull()) {
+    return 0.0f;
+  }
+
+  TouchHandleDrawableContext* context =
+      qobject_cast<TouchHandleDrawableContext*>(context_->contextObject());
+  return context->horizontalPaddingRatio();
+}
+
+void TouchHandleDrawable::instantiateComponent() {
+  if (view_.isNull()) {
+    qWarning() <<
+        "TouchHandleDrawable: "
+        "Can't instantiate after the view has gone";
+    return;
+  }
+
+  TouchHandleDrawableContext* contextObject =
+      new TouchHandleDrawableContext();
+  QQmlComponent* component = view_->touchSelectionController()->handle();
+  if (!component) {
+    qWarning() <<
+        "TouchHandleDrawable: Content requested a touch handle "
+        "drawable, but the application hasn't provided one";
+    delete contextObject;
+    return;
+  }
+
+  QQmlContext* baseContext = component->creationContext();
+  if (!baseContext) {
+    baseContext = QQmlEngine::contextForObject(view_.data());
+  }
+  context_.reset(new QQmlContext(baseContext));
+
+  context_->setContextObject(contextObject);
+  contextObject->setParent(context_.data());
+
+  item_.reset(
+      qobject_cast<QQuickItem*>(component->beginCreate(context_.data())));
+  if (!item_) {
+    qWarning() <<
+        "TouchHandleDrawable: Failed to create instance of "
+        "Qml touch selection handle component";
+    context_.reset();
+    return;
+  }
+
+  OxideQQuickWebViewPrivate::get(
+      view_.data())->addAttachedPropertyTo(item_.data());
+  item_->setParentItem(view_.data());
+  component->completeCreate();
+}
+
+TouchHandleDrawable::TouchHandleDrawable(OxideQQuickWebView* view)
+    : view_(view) {
+  instantiateComponent();
+
+  if (view) {
+    connect(view->touchSelectionController(), SIGNAL(handleChanged()),
+            SLOT(handleComponentChanged()));
+  }
+}
+
+void TouchHandleDrawable::handleComponentChanged() {
+  bool visible = item_.isNull() ? false : item_->isVisible();
+  OxideQQuickTouchSelectionController::HandleOrientation orientation =
+      OxideQQuickTouchSelectionController::HandleOrientationUndefined;
+  bool mirror_vertical = false;
+  bool mirror_horizontal = false;
+  if (!context_.isNull()) {
+    TouchHandleDrawableContext* context =
+        qobject_cast<TouchHandleDrawableContext*>(context_->contextObject());
+    orientation = context->orientation();
+    mirror_vertical = context->mirrorVertical();
+    mirror_horizontal = context->mirrorHorizontal();
+  }
+  QPointF position(item_.isNull() ? 0.0 : item_->x(),
+                   item_.isNull() ? 0.0 : item_->y());
+  qreal opacity = item_.isNull() ? 0.0 : item_->opacity();
+
+  item_.reset();
+  context_.reset();
+  instantiateComponent();
+
+  if (!item_.isNull()) {
+    SetEnabled(visible);
+    TouchHandleDrawableContext* context =
+        qobject_cast<TouchHandleDrawableContext*>(
+          context_->contextObject());
+    context->setOrientation(orientation);
+    context->setMirrorVertical(mirror_vertical);
+    context->setMirrorHorizontal(mirror_horizontal);
+    SetOrigin(position);
+    SetAlpha(opacity);
+  }
+}
+
+} // namespace qquick
+} // namespace oxide
+
+#include "oxide_qquick_touch_handle_drawable.moc"

=== added file 'qt/quick/oxide_qquick_touch_handle_drawable.h'
--- qt/quick/oxide_qquick_touch_handle_drawable.h	1970-01-01 00:00:00 +0000
+++ qt/quick/oxide_qquick_touch_handle_drawable.h	2016-01-08 22:47:28 +0000
@@ -0,0 +1,70 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015-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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_QT_QUICK_TOUCH_HANDLE_DRAWABLE_H_
+#define _OXIDE_QT_QUICK_TOUCH_HANDLE_DRAWABLE_H_
+
+#include <QPointer>
+#include <QScopedPointer>
+#include <QtGlobal>
+
+#include "qt/core/glue/oxide_qt_touch_handle_drawable_proxy.h"
+
+class OxideQQuickWebView;
+
+QT_BEGIN_NAMESPACE
+class QQmlContext;
+class QQuickItem;
+QT_END_NAMESPACE
+
+namespace oxide {
+namespace qquick {
+
+class TouchHandleDrawable :
+    public QObject, public oxide::qt::TouchHandleDrawableProxy {
+  Q_OBJECT
+
+ public:
+  TouchHandleDrawable(OxideQQuickWebView* view);
+
+ private Q_SLOTS:
+  void handleComponentChanged();
+
+ private:
+  ~TouchHandleDrawable() override;
+
+  void instantiateComponent();
+
+  // oxide::qt::TouchHandleDrawableProxy implementation
+  void SetEnabled(bool enabled);
+  void SetOrientation(Orientation orientation,
+                      bool mirror_vertical,
+                      bool mirror_horizontal);
+  void SetOrigin(const QPointF& origin);
+  void SetAlpha(float alpha);
+  QRectF GetVisibleBounds() const;
+  float GetDrawableHorizontalPaddingRatio() const;
+
+  QPointer<OxideQQuickWebView> view_;
+  QScopedPointer<QQmlContext> context_;
+  QScopedPointer<QQuickItem> item_;
+};
+
+} // namespace qquick
+} // namespace oxide
+
+#endif // _OXIDE_QT_QUICK_TOUCH_HANDLE_DRAWABLE_H_

=== modified file 'qt/quick/oxide_qquick_web_context_menu.cc'
--- qt/quick/oxide_qquick_web_context_menu.cc	2015-05-28 23:51:39 +0000
+++ qt/quick/oxide_qquick_web_context_menu.cc	2016-01-08 22:47:28 +0000
@@ -27,6 +27,7 @@
 #include <QUrl>
 
 #include "qt/core/glue/oxide_qt_web_context_menu_proxy_client.h"
+#include "qt/core/glue/oxide_qt_web_view_proxy_client.h"
 #include "qt/quick/api/oxideqquickwebview_p.h"
 #include "qt/quick/api/oxideqquickwebview_p_p.h"
 

=== added file 'qt/tests/qmltests/api/tst_WebView_editingCapabilities.html'
--- qt/tests/qmltests/api/tst_WebView_editingCapabilities.html	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_editingCapabilities.html	2016-01-08 22:47:28 +0000
@@ -0,0 +1,6 @@
+<html>
+<body id="body">
+  <p id="p">lorem ipsum</p>
+  <textarea id="textarea" rows="3" cols="10">dolor sit amet</textarea>
+</body>
+</html>

=== added file 'qt/tests/qmltests/api/tst_WebView_editingCapabilities.qml'
--- qt/tests/qmltests/api/tst_WebView_editingCapabilities.qml	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_editingCapabilities.qml	2016-01-08 22:47:28 +0000
@@ -0,0 +1,132 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.12
+import com.canonical.Oxide.Testing 1.0
+
+TestWebView {
+  id: webView
+  focus: true
+  width: 200
+  height: 200
+
+  SignalSpy {
+    id: editingCapabilitiesSpy
+    target: webView
+    signalName: "editingCapabilitiesChanged"
+  }
+
+  TestCase {
+    name: "WebView_editingCapabilities"
+    when: windowShown
+
+    function focus_textarea() {
+      var r = webView.getTestApi().getBoundingClientRectForSelector("#textarea");
+      mouseClick(webView, r.x + r.width / 2, r.y + r.height / 2, Qt.LeftButton);
+      compare(webView.getTestApi().evaluateCode(
+          "return document.activeElement.id;", true),
+          "textarea");
+    }
+
+    function unfocus_textarea() {
+      var r = webView.getTestApi().getBoundingClientRectForSelector("#p");
+      mouseClick(webView, r.x + r.width / 2, r.y + r.height / 2, Qt.LeftButton);
+      compare(webView.getTestApi().evaluateCode(
+          "return document.activeElement.id;", true),
+          "body");
+    }
+
+    function init() {
+      webView.url = "http://testsuite/tst_WebView_editingCapabilities.html";
+      verify(webView.waitForLoadSucceeded(),
+             "Timed out waiting for successful load");
+      Utils.clearClipboard();
+      editingCapabilitiesSpy.clear();
+    }
+
+    function test_WebView_editingCapabilities_no_selection() {
+      compare(webView.editingCapabilities, WebView.SelectAllCapability);
+    }
+
+    function test_WebView_editingCapabilities_page_selection() {
+      webView.executeEditingCommand(WebView.EditingCommandSelectAll);
+      editingCapabilitiesSpy.wait();
+      compare(webView.editingCapabilities,
+              WebView.CopyCapability | WebView.SelectAllCapability);
+
+      editingCapabilitiesSpy.clear();
+      webView.executeEditingCommand(WebView.EditingCommandCopy);
+      compare(webView.editingCapabilities,
+              WebView.CopyCapability | WebView.SelectAllCapability);
+      compare(editingCapabilitiesSpy.count, 0);
+    }
+
+    function test_WebView_editingCapabilities_textarea_selection() {
+      focus_textarea();
+      editingCapabilitiesSpy.wait();
+      compare(webView.editingCapabilities, WebView.SelectAllCapability);
+
+      webView.executeEditingCommand(WebView.EditingCommandSelectAll);
+      editingCapabilitiesSpy.wait();
+      compare(webView.editingCapabilities,
+              WebView.CutCapability | WebView.CopyCapability |
+              WebView.EraseCapability | WebView.SelectAllCapability);
+
+      webView.executeEditingCommand(WebView.EditingCommandCopy);
+      editingCapabilitiesSpy.wait();
+      compare(webView.editingCapabilities,
+              WebView.CutCapability | WebView.CopyCapability |
+              WebView.PasteCapability | WebView.EraseCapability |
+              WebView.SelectAllCapability);
+
+      webView.executeEditingCommand(WebView.EditingCommandCut);
+      editingCapabilitiesSpy.wait();
+      compare(webView.editingCapabilities,
+              WebView.PasteCapability | WebView.SelectAllCapability);
+
+      webView.executeEditingCommand(WebView.EditingCommandUndo);
+      // FIXME: https://launchpad.net/bugs/1524288
+      /*editingCapabilitiesSpy.wait();
+      compare(webView.editingCapabilities,
+              WebView.CutCapability | WebView.CopyCapability |
+              WebView.PasteCapability | WebView.EraseCapability |
+              WebView.SelectAllCapability);*/
+
+      webView.executeEditingCommand(WebView.EditingCommandRedo);
+      // FIXME: https://launchpad.net/bugs/1524288
+      /*editingCapabilitiesSpy.wait();
+      compare(webView.editingCapabilities,
+              WebView.PasteCapability | WebView.SelectAllCapability);*/
+
+      webView.executeEditingCommand(WebView.EditingCommandPaste);
+      compare(webView.editingCapabilities,
+              WebView.PasteCapability | WebView.SelectAllCapability);
+
+      webView.executeEditingCommand(WebView.EditingCommandSelectAll);
+      editingCapabilitiesSpy.wait();
+      compare(webView.editingCapabilities,
+              WebView.CutCapability | WebView.CopyCapability |
+              WebView.PasteCapability | WebView.EraseCapability |
+              WebView.SelectAllCapability);
+
+      webView.executeEditingCommand(WebView.EditingCommandErase);
+      // FIXME: https://launchpad.net/bugs/1524288
+      /*editingCapabilitiesSpy.wait();
+      compare(webView.editingCapabilities,
+              WebView.PasteCapability | WebView.SelectAllCapability);*/
+    }
+
+    function test_WebView_editingCapabilities_clipboard_data_changed() {
+      focus_textarea();
+      compare(webView.editingCapabilities, WebView.SelectAllCapability);
+
+      Utils.copyToClipboard("text/plain", "foo bar baz");
+      editingCapabilitiesSpy.wait();
+      compare(webView.editingCapabilities,
+              WebView.PasteCapability | WebView.SelectAllCapability);
+
+      Utils.clearClipboard();
+      editingCapabilitiesSpy.wait();
+      compare(webView.editingCapabilities, WebView.SelectAllCapability);
+    }
+  }
+}

=== modified file 'shared/browser/oxide_browser_platform_integration.cc'
--- shared/browser/oxide_browser_platform_integration.cc	2015-11-30 11:23:36 +0000
+++ shared/browser/oxide_browser_platform_integration.cc	2016-01-08 22:47:28 +0000
@@ -101,4 +101,10 @@
                     ApplicationStateChanged());
 }
 
+void BrowserPlatformIntegration::NotifyClipboardDataChanged() {
+  FOR_EACH_OBSERVER(BrowserPlatformIntegrationObserver,
+                    observers_,
+                    ClipboardDataChanged());
+}
+
 } // namespace oxide

=== modified file 'shared/browser/oxide_browser_platform_integration.h'
--- shared/browser/oxide_browser_platform_integration.h	2015-11-30 11:23:36 +0000
+++ shared/browser/oxide_browser_platform_integration.h	2016-01-08 22:47:28 +0000
@@ -110,6 +110,8 @@
 
   void NotifyApplicationStateChanged();
 
+  void NotifyClipboardDataChanged();
+
  private:
   friend class BrowserPlatformIntegrationObserver;
 

=== modified file 'shared/browser/oxide_browser_platform_integration_observer.h'
--- shared/browser/oxide_browser_platform_integration_observer.h	2015-11-30 11:23:36 +0000
+++ shared/browser/oxide_browser_platform_integration_observer.h	2016-01-08 22:47:28 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2014 Canonical Ltd.
+// Copyright (C) 2014-2015 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -28,6 +28,8 @@
 
   virtual void ApplicationStateChanged() {}
 
+  virtual void ClipboardDataChanged() {}
+
  protected:
   BrowserPlatformIntegrationObserver();
 };

=== modified file 'shared/browser/oxide_render_widget_host_view.cc'
--- shared/browser/oxide_render_widget_host_view.cc	2016-01-04 13:40:25 +0000
+++ shared/browser/oxide_render_widget_host_view.cc	2016-01-08 22:47:28 +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
@@ -29,17 +29,23 @@
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/delegated_frame_data.h"
+#include "cc/output/viewport_selection_bound.h"
 #include "cc/quads/render_pass.h"
+#include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/render_view_host.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
 #include "third_party/WebKit/public/platform/WebGestureDevice.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "ui/base/touch/selection_bound.h"
 #include "ui/events/gesture_detection/motion_event.h"
+#include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
+#include "ui/touch_selection/touch_selection_controller.h"
 
 #include "shared/browser/compositor/oxide_compositor.h"
 #include "shared/browser/input/oxide_input_method_context.h"
@@ -78,7 +84,35 @@
   return content_width_css <= window_width_dip + kMobileViewportWidthEpsilon;
 }
 
-}
+ui::SelectionBound::Type ConvertSelectionBoundType(
+    cc::SelectionBoundType type) {
+  switch (type) {
+    case cc::SELECTION_BOUND_LEFT:
+      return ui::SelectionBound::LEFT;
+    case cc::SELECTION_BOUND_RIGHT:
+      return ui::SelectionBound::RIGHT;
+    case cc::SELECTION_BOUND_CENTER:
+      return ui::SelectionBound::CENTER;
+    case cc::SELECTION_BOUND_EMPTY:
+      return ui::SelectionBound::EMPTY;
+  }
+  NOTREACHED() << "Unknown selection bound type";
+  return ui::SelectionBound::EMPTY;
+}
+
+// Copied from content/browser/renderer_host/input/ui_touch_selection_helper.cc,
+// because that helper is not part of content’s public API.
+ui::SelectionBound ConvertSelectionBound(
+    const cc::ViewportSelectionBound& bound) {
+  ui::SelectionBound ui_bound;
+  ui_bound.set_type(ConvertSelectionBoundType(bound.type));
+  ui_bound.set_visible(bound.visible);
+  if (ui_bound.type() != ui::SelectionBound::EMPTY)
+    ui_bound.SetEdge(bound.edge_top, bound.edge_bottom);
+  return ui_bound;
+}
+
+} // namespace
 
 void RenderWidgetHostView::OnTextInputStateChanged(
     ui::TextInputType type,
@@ -112,6 +146,10 @@
   ime_bridge_.SelectionBoundsChanged(caret_rect,
                                      selection_cursor_position,
                                      selection_anchor_position);
+
+  if (container_) {
+    container_->EditingCapabilitiesChanged();
+  }
 }
 
 void RenderWidgetHostView::SelectionChanged(const base::string16& text,
@@ -266,6 +304,13 @@
   if (!compositor || !compositor->IsActive()) {
     RunAckCallbacks();
   }
+
+  const cc::ViewportSelection& selection = compositor_frame_metadata_.selection;
+  selection_controller_->OnSelectionEditable(selection.is_editable);
+  selection_controller_->OnSelectionEmpty(selection.is_empty_text_form_control);
+  selection_controller_->OnSelectionBoundsChanged(
+      ConvertSelectionBound(selection.start),
+      ConvertSelectionBound(selection.end));
 }
 
 void RenderWidgetHostView::ClearCompositorFrame() {
@@ -473,6 +518,10 @@
     return;
   }
 
+  if (HandleGestureForTouchSelection(event)) {
+    return;
+  }
+
   if (event.type == blink::WebInputEvent::GestureTapDown) {
     // Webkit does not stop a fling-scroll on tap-down. So explicitly send an
     // event to stop any in-progress flings.
@@ -489,6 +538,43 @@
   host_->ForwardGestureEvent(event);
 }
 
+bool RenderWidgetHostView::HandleGestureForTouchSelection(
+    const blink::WebGestureEvent& event) const {
+  switch (event.type) {
+    case blink::WebInputEvent::GestureLongPress: {
+      base::TimeTicks event_time = base::TimeTicks() +
+          base::TimeDelta::FromSecondsD(event.timeStampSeconds);
+      gfx::PointF location(event.x, event.y);
+      if (selection_controller_->WillHandleLongPressEvent(
+              event_time, location)) {
+        return true;
+      }
+      break;
+    }
+    case blink::WebInputEvent::GestureTap: {
+      gfx::PointF location(event.x, event.y);
+      if (selection_controller_->WillHandleTapEvent(
+              location, event.data.tap.tapCount)) {
+        return true;
+      }
+      break;
+    }
+    case blink::WebInputEvent::GestureScrollBegin:
+      // XXX: currently commented out because when doing a pinch-to-zoom
+      // gesture, we don’t always get the corresponding GestureScrollEnd event,
+      // so selection handles would remain hidden.
+      //selection_controller()->SetTemporarilyHidden(true);
+      break;
+    case blink::WebInputEvent::GestureScrollEnd:
+      // XXX: see above
+      //selection_controller()->SetTemporarilyHidden(false);
+      break;
+    default:
+      break;
+  }
+  return false;
+}
+
 void RenderWidgetHostView::EvictCurrentFrame() {
   frame_is_evicted_ = true;
   DestroyDelegatedContent();
@@ -500,6 +586,55 @@
   }
 }
 
+bool RenderWidgetHostView::SupportsAnimation() const {
+  return false;
+}
+
+void RenderWidgetHostView::SetNeedsAnimate() {
+  NOTREACHED();
+}
+
+void RenderWidgetHostView::MoveCaret(const gfx::PointF& position) {
+  content::RenderWidgetHostImpl* rwhi =
+      content::RenderWidgetHostImpl::From(host_);
+  rwhi->MoveCaret(gfx::ToRoundedPoint(position));
+}
+
+void RenderWidgetHostView::MoveRangeSelectionExtent(const gfx::PointF& extent) {
+  content::RenderWidgetHostImpl* rwhi =
+      content::RenderWidgetHostImpl::From(host_);
+  content::RenderWidgetHostDelegate* host_delegate = rwhi->delegate();
+  if (host_delegate) {
+    host_delegate->MoveRangeSelectionExtent(gfx::ToRoundedPoint(extent));
+  }
+}
+
+void RenderWidgetHostView::SelectBetweenCoordinates(const gfx::PointF& base,
+                                                    const gfx::PointF& extent) {
+  content::RenderWidgetHostImpl* rwhi =
+      content::RenderWidgetHostImpl::From(host_);
+  content::RenderWidgetHostDelegate* host_delegate = rwhi->delegate();
+  if (host_delegate) {
+    host_delegate->SelectRange(gfx::ToRoundedPoint(base),
+                               gfx::ToRoundedPoint(extent));
+  }
+}
+
+void RenderWidgetHostView::OnSelectionEvent(ui::SelectionEventType event) {
+  if (container_) {
+    container_->TouchSelectionChanged();
+  }
+}
+
+scoped_ptr<ui::TouchHandleDrawable> RenderWidgetHostView::CreateDrawable() {
+  if (!container_) {
+    return nullptr;
+  }
+
+  return scoped_ptr<ui::TouchHandleDrawable>(
+      container_->CreateTouchHandleDrawable());
+}
+
 void RenderWidgetHostView::UpdateCurrentCursor() {
   if (is_loading_) {
     content::WebCursor::CursorInfo busy_cursor_info(
@@ -593,6 +728,16 @@
   host_->SetView(this);
 
   gesture_provider_->SetDoubleTapSupportForPageEnabled(false);
+
+  ui::TouchSelectionController::Config tsc_config;
+  // 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.show_on_tap_for_empty_editable = true;
+  tsc_config.enable_longpress_drag_selection = false;
+  selection_controller_.reset(
+      new ui::TouchSelectionController(this, tsc_config));
 }
 
 RenderWidgetHostView::~RenderWidgetHostView() {
@@ -624,9 +769,15 @@
 void RenderWidgetHostView::Blur() {
   host_->SetActive(false);
   host_->Blur();
+
+  selection_controller_->HideAndDisallowShowingAutomatically();
 }
 
 void RenderWidgetHostView::HandleTouchEvent(const ui::MotionEvent& event) {
+  if (selection_controller_->WillHandleTouchEvent(event)) {
+    return;
+  }
+
   auto rv = gesture_provider_->OnTouchEvent(event);
   if (!rv.succeeded) {
     return;

=== modified file 'shared/browser/oxide_render_widget_host_view.h'
--- shared/browser/oxide_render_widget_host_view.h	2016-01-04 13:40:25 +0000
+++ shared/browser/oxide_render_widget_host_view.h	2016-01-08 22:47:28 +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
@@ -30,6 +30,7 @@
 #include "cc/output/compositor_frame_metadata.h"
 #include "content/common/cursors/webcursor.h"
 #include "ui/gfx/geometry/size.h"
+#include "ui/touch_selection/touch_selection_controller.h"
 
 #include "shared/browser/compositor/oxide_compositor_observer.h"
 #include "shared/browser/input/oxide_ime_bridge_impl.h"
@@ -48,6 +49,8 @@
 
 namespace ui {
 class MotionEvent;
+class TouchHandleDrawable;
+class TouchSelectionController;
 }
 
 namespace oxide {
@@ -60,6 +63,7 @@
     public GestureProviderClient,
     public RendererFrameEvictorClient,
     public cc::DelegatedFrameResourceCollectionClient,
+    public ui::TouchSelectionControllerClient,
     public base::SupportsWeakPtr<RenderWidgetHostView> {
  public:
   RenderWidgetHostView(content::RenderWidgetHostImpl* render_widget_host);
@@ -73,6 +77,10 @@
     return selection_text_;
   }
 
+  const gfx::Range& selection_range() const {
+    return selection_range_;
+  }
+
   const cc::CompositorFrameMetadata& compositor_frame_metadata() const {
     return compositor_frame_metadata_;
   }
@@ -92,6 +100,10 @@
   void Show() final;
   void Hide() final;
 
+  ui::TouchSelectionController* selection_controller() const {
+    return selection_controller_.get();
+  }
+
  private:
   // content::RenderWidgetHostViewOxide implementation
   void OnTextInputStateChanged(ui::TextInputType type,
@@ -172,6 +184,16 @@
   // cc::DelegatedFrameResourceCollectionClient implementation
   void UnusedResourcesAreAvailable() final;
 
+  // ui::TouchSelectionControllerClient implementation
+  bool SupportsAnimation() const override;
+  void SetNeedsAnimate() override;
+  void MoveCaret(const gfx::PointF& position) override;
+  void MoveRangeSelectionExtent(const gfx::PointF& extent) override;
+  void SelectBetweenCoordinates(const gfx::PointF& base,
+                                const gfx::PointF& extent) override;
+  void OnSelectionEvent(ui::SelectionEventType event) override;
+  scoped_ptr<ui::TouchHandleDrawable> CreateDrawable() override;
+
   // ===================
 
   void UpdateCurrentCursor();
@@ -183,6 +205,8 @@
   void AttachLayer();
   void DetachLayer();
 
+  bool HandleGestureForTouchSelection(const blink::WebGestureEvent& event) const;
+
   content::RenderWidgetHostImpl* host_;
 
   RenderWidgetHostViewContainer* container_;
@@ -217,6 +241,8 @@
 
   scoped_ptr<GestureProvider> gesture_provider_;
 
+  scoped_ptr<ui::TouchSelectionController> selection_controller_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(RenderWidgetHostView);
 };
 

=== modified file 'shared/browser/oxide_render_widget_host_view_container.h'
--- shared/browser/oxide_render_widget_host_view_container.h	2015-10-27 19:37:13 +0000
+++ shared/browser/oxide_render_widget_host_view_container.h	2016-01-08 22:47:28 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2014-2015 Canonical Ltd.
+// Copyright (C) 2014-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
@@ -21,6 +21,7 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "content/public/common/menu_item.h"
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
 #include "ui/gfx/geometry/rect.h"
@@ -39,6 +40,10 @@
 class Rect;
 }
 
+namespace ui {
+class TouchHandleDrawable;
+}
+
 namespace oxide {
 
 class Compositor;
@@ -79,6 +84,12 @@
                              const std::vector<content::MenuItem>& items,
                              bool allow_multiple_selection) = 0;
   virtual void HidePopupMenu() = 0;
+
+  virtual ui::TouchHandleDrawable* CreateTouchHandleDrawable() const = 0;
+
+  virtual void TouchSelectionChanged() const = 0;
+
+  virtual void EditingCapabilitiesChanged() = 0;
 };
 
 } // namespace oxide

=== modified file 'shared/browser/oxide_web_view.cc'
--- shared/browser/oxide_web_view.cc	2016-01-04 13:40:25 +0000
+++ shared/browser/oxide_web_view.cc	2016-01-08 22:47:28 +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
@@ -60,10 +60,12 @@
 #include "net/base/net_errors.h"
 #include "net/ssl/ssl_info.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "ui/base/clipboard/clipboard.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/events/event.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/shell_dialogs/selected_file_info.h"
+#include "ui/touch_selection/touch_selection_controller.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
@@ -149,6 +151,18 @@
   FaviconHelper::CreateForWebContents(contents);
 }
 
+bool HasLocationBarOffsetChanged(const cc::CompositorFrameMetadata& old,
+                                 const cc::CompositorFrameMetadata& current) {
+  if (old.location_bar_offset.y() != current.location_bar_offset.y()) {
+    return true;
+  }
+  if (old.location_bar_content_translation.y() !=
+      current.location_bar_content_translation.y()) {
+    return true;
+  }
+  return false;
+}
+
 OXIDE_MAKE_ENUM_BITWISE_OPERATORS(ui::PageTransition)
 OXIDE_MAKE_ENUM_BITWISE_OPERATORS(ContentType)
 
@@ -211,6 +225,7 @@
       location_bar_height_pix_(0),
       location_bar_constraints_(blink::WebTopControlsBoth),
       location_bar_animated_(true),
+      edit_flags_(blink::WebContextMenuData::CanDoNone),
       weak_factory_(this) {
   CHECK(client) << "Didn't specify a client";
 
@@ -435,6 +450,21 @@
   // TODO(chrisccoulson): Merge these
   client_->FrameMetadataUpdated(old);
   client_->SwapCompositorFrame();
+
+  RenderWidgetHostView* rwhv = GetRenderWidgetHostView();
+  if (rwhv) {
+    ui::TouchSelectionController* controller = rwhv->selection_controller();
+    // If the location bar offset changes while a touch selection is active,
+    // the bounding rect and the position of the handles need to be updated.
+    if ((controller->active_status() !=
+         ui::TouchSelectionController::INACTIVE) &&
+        HasLocationBarOffsetChanged(old, compositor_frame_metadata_)) {
+      TouchSelectionChanged();
+      // XXX: hack to ensure the position of the handles is updated.
+      controller->SetTemporarilyHidden(true);
+      controller->SetTemporarilyHidden(false);
+    }
+  }
 }
 
 void WebView::WebPreferencesDestroyed() {
@@ -537,6 +567,62 @@
   active_popup_menu_->Close();
 }
 
+ui::TouchHandleDrawable* WebView::CreateTouchHandleDrawable() const {
+  return client_->CreateTouchHandleDrawable();
+}
+
+void WebView::TouchSelectionChanged() const {
+  RenderWidgetHostView* rwhv = GetRenderWidgetHostView();
+  if (!rwhv) {
+    return;
+  }
+
+  ui::TouchSelectionController* controller = rwhv->selection_controller();
+  bool active =
+      (controller->active_status() != ui::TouchSelectionController::INACTIVE);
+
+  gfx::RectF bounds = controller->GetRectBetweenBounds();
+  bounds.Offset(0, GetLocationBarContentOffsetDip());
+
+  client_->TouchSelectionChanged(active, bounds);
+}
+
+void WebView::EditingCapabilitiesChanged() {
+  int flags = blink::WebContextMenuData::CanDoNone;
+  RenderWidgetHostView* rwhv = GetRenderWidgetHostView();
+  if (!rwhv) {
+    edit_flags_ = flags;
+    return;
+  }
+
+  ui::TextInputType text_input_type = rwhv->ime_bridge()->text_input_type();
+  bool editable = (text_input_type != ui::TEXT_INPUT_TYPE_NONE);
+  bool readable = (text_input_type != ui::TEXT_INPUT_TYPE_PASSWORD);
+  bool has_selection = !rwhv->selection_range().is_empty();
+  base::string16 clipboard;
+  ui::Clipboard::GetForCurrentThread()->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE,
+                                                 &clipboard);
+  // XXX: if editable, can we determine whether undo/redo is available?
+  if (editable && readable && has_selection) {
+    flags |= blink::WebContextMenuData::CanCut;
+  }
+  if (readable && has_selection) {
+    flags |= blink::WebContextMenuData::CanCopy;
+  }
+  if (editable && !clipboard.empty()) {
+    flags |= blink::WebContextMenuData::CanPaste;
+  }
+  if (editable && has_selection) {
+    flags |= blink::WebContextMenuData::CanDelete;
+  }
+  flags |= blink::WebContextMenuData::CanSelectAll;
+  
+  if (flags != edit_flags_) {
+    edit_flags_ = flags;
+    client_->OnEditingCapabilitiesChanged();
+  }
+}
+
 content::WebContents* WebView::OpenURLFromTab(
     content::WebContents* source,
     const content::OpenURLParams& params) {
@@ -971,6 +1057,8 @@
   }
 
   InitializeTopControlsForHost(new_host, !old_host);
+
+  EditingCapabilitiesChanged();
 }
 
 void WebView::DidStartLoading() {
@@ -1190,6 +1278,10 @@
   return handled;
 }
 
+void WebView::ClipboardDataChanged() {
+  EditingCapabilitiesChanged();
+}
+
 WebView::WebView(const Params& params)
     : WebView(params.client) {
   CHECK(params.context) << "Didn't specify a BrowserContext";
@@ -1676,17 +1768,17 @@
   return gfx::Size(std::round(size.width()), std::round(size.height()));
 }
 
-int WebView::GetLocationBarOffsetPix() {
+int WebView::GetLocationBarOffsetPix() const {
   return compositor_frame_metadata().location_bar_offset.y() *
          compositor_frame_metadata().device_scale_factor;
 }
 
-int WebView::GetLocationBarContentOffsetPix() {
+int WebView::GetLocationBarContentOffsetPix() const {
   return compositor_frame_metadata().location_bar_content_translation.y() *
          compositor_frame_metadata().device_scale_factor;
 }
 
-float WebView::GetLocationBarContentOffsetDip() {
+float WebView::GetLocationBarContentOffsetDip() const {
   return compositor_frame_metadata().location_bar_content_translation.y();
 }
 
@@ -1958,5 +2050,9 @@
   return client_->CanCreateWindows();
 }
 
+int WebView::GetEditFlags() const {
+  return edit_flags_;
+}
+
 } // namespace oxide
 

=== modified file 'shared/browser/oxide_web_view.h'
--- shared/browser/oxide_web_view.h	2016-01-04 13:40:25 +0000
+++ shared/browser/oxide_web_view.h	2016-01-08 22:47:28 +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
@@ -44,6 +44,7 @@
 #include "shared/browser/compositor/oxide_compositor_client.h"
 #include "shared/browser/compositor/oxide_compositor_observer.h"
 #include "shared/browser/input/oxide_input_method_context_observer.h"
+#include "shared/browser/oxide_browser_platform_integration_observer.h"
 #include "shared/browser/oxide_content_types.h"
 #include "shared/browser/oxide_render_object_id.h"
 #include "shared/browser/oxide_render_widget_host_view_container.h"
@@ -85,6 +86,7 @@
 
 namespace ui {
 class TouchEvent;
+class TouchHandleDrawable;
 }
 
 namespace oxide {
@@ -131,7 +133,8 @@
                 private content::NotificationObserver,
                 private RenderWidgetHostViewContainer,
                 private content::WebContentsDelegate,
-                private content::WebContentsObserver {
+                private content::WebContentsObserver,
+                private BrowserPlatformIntegrationObserver {
  public:
 
   struct Params {
@@ -225,9 +228,9 @@
   gfx::Size GetCompositorFrameContentSizePix();
   gfx::Size GetCompositorFrameViewportSizePix();
 
-  int GetLocationBarOffsetPix();
-  int GetLocationBarContentOffsetPix();
-  float GetLocationBarContentOffsetDip();
+  int GetLocationBarOffsetPix() const;
+  int GetLocationBarContentOffsetPix() const;
+  float GetLocationBarContentOffsetDip() const;
 
   const SecurityStatus& security_status() const { return security_status_; }
 
@@ -290,6 +293,8 @@
 
   const GURL& target_url() const { return target_url_; }
 
+  int GetEditFlags() const;
+
  private:
   WebView(WebViewClient* client);
 
@@ -358,6 +363,9 @@
                      const std::vector<content::MenuItem>& items,
                      bool allow_multiple_selection) final;
   void HidePopupMenu() final;
+  ui::TouchHandleDrawable* CreateTouchHandleDrawable() const final;
+  void TouchSelectionChanged() const final;
+  void EditingCapabilitiesChanged() final;
 
   // content::WebContentsDelegate implementation
   content::WebContents* OpenURLFromTab(content::WebContents* source,
@@ -472,6 +480,9 @@
   bool OnMessageReceived(const IPC::Message& msg,
                          content::RenderFrameHost* render_frame_host) final;
 
+  // BrowserPlatformIntegrationObserver implementation
+  void ClipboardDataChanged() final;
+
   WebViewClient* client_;
 
   struct WebContentsDeleter {
@@ -516,6 +527,8 @@
 
   GURL target_url_;
 
+  int edit_flags_;
+
   base::WeakPtrFactory<WebView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebView);

=== modified file 'shared/browser/oxide_web_view_client.cc'
--- shared/browser/oxide_web_view_client.cc	2015-11-23 17:58:35 +0000
+++ shared/browser/oxide_web_view_client.cc	2016-01-08 22:47:28 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2015 Canonical Ltd.
+// Copyright (C) 2015-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
@@ -131,6 +131,13 @@
   return nullptr;
 }
 
+ui::TouchHandleDrawable* WebViewClient::CreateTouchHandleDrawable() const {
+  return nullptr;
+}
+
+void WebViewClient::TouchSelectionChanged(bool active,
+                                          const gfx::RectF& bounds) const {}
+
 void WebViewClient::EvictCurrentFrame() {}
 
 InputMethodContext* WebViewClient::GetInputMethodContext() const {
@@ -152,4 +159,6 @@
 void WebViewClient::HttpAuthenticationRequested(
     ResourceDispatcherHostLoginDelegate* login_delegate) {}
 
+void WebViewClient::OnEditingCapabilitiesChanged() {}
+
 } // namespace oxide

=== modified file 'shared/browser/oxide_web_view_client.h'
--- shared/browser/oxide_web_view_client.h	2015-11-23 17:58:35 +0000
+++ shared/browser/oxide_web_view_client.h	2016-01-08 22:47:28 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2015 Canonical Ltd.
+// Copyright (C) 2015-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
@@ -44,6 +44,14 @@
 class WebCursor;
 }
 
+namespace gfx {
+class RectF;
+}
+
+namespace ui {
+class TouchHandleDrawable;
+}
+
 namespace oxide {
 
 class CertificateError;
@@ -52,6 +60,7 @@
 class JavaScriptDialog;
 class ResourceDispatcherHostLoginDelegate;
 class SecurityStatus;
+class TouchHandleDrawableDelegate;
 class WebContextMenu;
 class WebPopupMenu;
 class WebView;
@@ -162,6 +171,10 @@
 
   virtual FilePicker* CreateFilePicker(content::RenderViewHost* rvh);
 
+  virtual ui::TouchHandleDrawable* CreateTouchHandleDrawable() const;
+  virtual void TouchSelectionChanged(bool active,
+                                     const gfx::RectF& bounds) const;
+
   virtual void SwapCompositorFrame() = 0;
 
   virtual void EvictCurrentFrame();
@@ -187,6 +200,8 @@
 
   virtual void HttpAuthenticationRequested(
       ResourceDispatcherHostLoginDelegate* login_delegate);
+
+  virtual void OnEditingCapabilitiesChanged();
 };
 
 } // namespace oxide

=== modified file 'shared/renderer/oxide_content_renderer_client.cc'
--- shared/renderer/oxide_content_renderer_client.cc	2015-10-13 21:42:44 +0000
+++ shared/renderer/oxide_content_renderer_client.cc	2016-01-08 22:47:28 +0000
@@ -100,9 +100,6 @@
   blink::WebSettings* settings = render_view->GetWebView()->settings();
   settings->setDoubleTapToZoomEnabled(true); // XXX: Make this configurable
 
-  // Remove this when we implement a selection API (see bug #1324292)
-  settings->setTouchEditingEnabled(false);
-
   if (GetFormFactorHint() == FORM_FACTOR_TABLET ||
       GetFormFactorHint() == FORM_FACTOR_PHONE) {
     settings->setAllowCustomScrollbarInMainFrame(false);
@@ -110,6 +107,7 @@
     settings->setMainFrameClipsContent(false);
     settings->setShrinksViewportContentToFit(true);
     settings->setUseMobileViewportStyle(true);
+    settings->setTouchEditingEnabled(true);
   }
 }
 

=== modified file 'shared/shared.gyp'
--- shared/shared.gyp	2016-01-08 21:31:20 +0000
+++ shared/shared.gyp	2016-01-08 22:47:28 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2013 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
@@ -265,6 +265,7 @@
         '<(DEPTH)/ui/gl/gl.gyp:gl',
         '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
         '<(DEPTH)/ui/ozone/ozone.gyp:ozone',
+        '<(DEPTH)/ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection',
         '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '../build/system.gyp:gdkpixbuf',