Merge lp:~abreu-alexandre/webbrowser-app/container-handle-context-menu into lp:webbrowser-app

[Alexandre Abreu]

Limited handling of custom context menu for the container

Limited handling of custom context menu for the container.

I duplicated the mobile context menu w/o the asset usage so that the webbrowser-app is not touched and the changes are limited. This is of course not a definite dialog,

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1231
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2359/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4667
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1113/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1113
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1113/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4664
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4664/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24255

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2359/rebuild

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/webbrowser-app/container-handle-context-menu]

1236. By Launchpad Translations on behalf of phablet-team on 2015-10-16

Launchpad automatic translations update.

[Olivier Tilloy (osomon)]

This fixes the issue for the webapp container indeed, but it doesn’t for the general Ubuntu WebView case: apps embedding a WebView and using the default context menu will still get the crash, as you remarked in https://bugs.launchpad.net/ubuntu/+source/webbrowser-app/+bug/1501330/comments/11.

I have submitted https://code.launchpad.net/~osomon/webbrowser-app/default-context-menu-crash-on-scroll/+merge/274671 which fixes the bug in the Ubuntu WebView. Let’s update the webapp container’s context menu in a separate branch (but let’s do it asap for OTA8).

[lp:~abreu-alexandre/webbrowser-app/container-handle-context-menu]

1237. By Arthur Mello on 2015-10-16

Add bookmarks view to top level menu
Approved by: Ugo Riboni, Olivier Tilloy

1238. By Olivier Tilloy on 2015-10-16

Ensure that the default context menu cannot be dismissed several times, causing a crash in oxide.
The issue in oxide remains, it should have a safeguard against this kind of behaviour. Fixes: #1501330
Approved by: Alexandre Abreu

1239. By Olivier Tilloy on 2015-10-16

Update a localized error string, per design. Fixes: #1493466
Approved by: Bartosz Kosiorek

1240. By Olivier Tilloy on 2015-10-16

Fixes for minor UX issues with the preview grid:
 - Make the highlight follow the item selected for deletion in the preview grid.
 - Do not show a highlight in the narrow version of the new tab view, as it doesn’t support keyboard navigation.
 - Grab dismiss area events so that they are not propagated to the view below when dismissing a context menu. Fixes: #1506579

1241. By Olivier Tilloy on 2015-10-16

Fix a couple of autopilot failures on desktop in narrow mode. Fixes: #1506879

1242. By CI Train Bot Account on 2015-10-16

Releasing 0.23+15.10.20151016-0ubuntu1

1243. By CI Train Bot Account on 2015-10-21

Resync trunk.

1244. By Olivier Tilloy on 2015-10-21

Update translation template.

1245. By Launchpad Translations on behalf of phablet-team on 2015-10-22

Launchpad automatic translations update.

1246. By Ugo Riboni on 2015-10-22

Implement support for allowing or denying access to media input devices and for setting default media input devices. Fixes: #1410996
Approved by: PS Jenkins bot, Olivier Tilloy

1247. By Ugo Riboni on 2015-10-22

Refactor the BookmarksModel to be a singleton.
Approved by: PS Jenkins bot

1248. By Ugo Riboni on 2015-10-22

Fix inability to drag the map to pan in Google maps, on desktop. Fixes: #1503506
Approved by: PS Jenkins bot, Olivier Tilloy

1249. By Olivier Tilloy on 2015-10-22

Add an exception to the generated apparmor profile to allow reading HERE’s TOS in the browser. Fixes: #1507667
Approved by: PS Jenkins bot, Olivier Tilloy

1250. By Olivier Tilloy on 2015-10-22

Modify the generated apparmor profile to allow rw access to /dev/shm/.org.chromium.Chromium.* too. Fixes: #1508054
Approved by: PS Jenkins bot

1251. By CI Train Bot Account on 2015-10-22

Releasing 0.23+15.10.20151022.1-0ubuntu1

1252. By CI Train Bot Account on 2015-10-23

Resync trunk.

1253. By Olivier Tilloy on 2015-10-23

Update translation template.

1254. By Launchpad Translations on behalf of phablet-team on 2015-10-24

Launchpad automatic translations update.

1255. By Launchpad Translations on behalf of phablet-team on 2015-10-25

Launchpad automatic translations update.

1256. By Launchpad Translations on behalf of phablet-team on 2015-10-26

Launchpad automatic translations update.

1257. By Launchpad Translations on behalf of phablet-team on 2015-10-28

Launchpad automatic translations update.

1258. By Launchpad Translations on behalf of phablet-team on 2015-10-29

Launchpad automatic translations update.

1259. By Launchpad Translations on behalf of phablet-team on 2015-10-30

Launchpad automatic translations update.

1260. By Launchpad Translations on behalf of phablet-team on 2015-11-01

Launchpad automatic translations update.

1261. By Launchpad Translations on behalf of phablet-team on 2015-11-02

Launchpad automatic translations update.

1262. By Ugo Riboni on 2015-11-03

Focus the page when opening links with target="_blank". Fixes: #1505724
Approved by: Olivier Tilloy, PS Jenkins bot

1263. By Ugo Riboni on 2015-11-03

Use AbstractButton to handle some tab interactions so that haptics are used on touch. Fixes: #1505725
Approved by: Olivier Tilloy, PS Jenkins bot

1264. By Ugo Riboni on 2015-11-03

Fix a bug preventing in some cases the address bar from getting focus when entering find in page mode. Also correctly hide the left hand side icons when in find in page mode. Fixes: #1508130
Approved by: Olivier Tilloy, PS Jenkins bot

1265. By Ugo Riboni on 2015-11-03

Prevent the address bar from being cleared when the actual url changes and the user has already started typing. Fixes: #1487713
Approved by: Olivier Tilloy

1266. By Ugo Riboni on 2015-11-03

Update the user script to remove the Facebook app banner. Fixes: #1352783
Approved by: Olivier Tilloy, PS Jenkins bot

1267. By CI Train Bot Account on 2015-11-03

Releasing 0.23+16.04.20151103-0ubuntu1

1268. By CI Train Bot Account on 2015-11-04

Resync trunk.

1269. By Launchpad Translations on behalf of phablet-team on 2015-11-05

Launchpad automatic translations update.

1270. By Launchpad Translations on behalf of phablet-team on 2015-11-08

Launchpad automatic translations update.

1271. By Ugo Riboni on 2015-11-11

Add keyboard shortcuts to undo closing tabs (Ctrl+Shift+T and Ctrl+Shift+W). Fixes: #1499767
Approved by: PS Jenkins bot, Olivier Tilloy

1272. By Ugo Riboni on 2015-11-11

Hide webviews created via onNewViewRequested until the tab they belong to becomes current. Fixes: #1464436
Approved by: PS Jenkins bot

1273. By Olivier Tilloy on 2015-11-11

Ship empty apparmor hardware profile directories to avoid adding a runtime dependency on apparmor-easyprof-ubuntu. Fixes: #1511439
Approved by: PS Jenkins bot, Jamie Strandboge

1274. By Ugo Riboni on 2015-11-11

Use lowercase letters for keyboard shortcut invokation in autopilot tests.

Autopilot tries to be too clever and automatically issues a Shift when an uppercase letter is used in a keypress combo. Fix our tests to adjust to this behavior.
Approved by: PS Jenkins bot, Olivier Tilloy

1275. By Olivier Tilloy on 2015-11-11

Add missing unit test cleanup.
Approved by: PS Jenkins bot

1276. By Ugo Riboni on 2015-11-11

Create the webview in a safer way, by keeping the incubator around and monitoring the progress, and by using sync creation if there is a pending request. Fixes: #1514701
Approved by: PS Jenkins bot

1277. By CI Train Bot Account on 2015-11-11

Releasing 0.23+16.04.20151111.2-0ubuntu1

1278. By Launchpad Translations on behalf of phablet-team on 2015-11-19

Launchpad automatic translations update.

1279. By Launchpad Translations on behalf of phablet-team on 2015-11-23

Launchpad automatic translations update.

1280. By Olivier Tilloy on 2015-11-24

Multiple changes to improve the tab switching animation.
The biggest remaining issue is bug #1502675, which is worked around here until it is properly addressed in oxide.
Approved by: PS Jenkins bot

1281. By CI Train Bot Account on 2015-11-24

Releasing 0.23+16.04.20151124-0ubuntu1

1282. By CI Train Bot Account on 2015-11-26

Resync trunk.

1283. By Olivier Tilloy on 2015-11-26

Add missing import statements, and add missing unit tests for BookmarksView.qml and BookmarksViewWide.qml. Fixes: #1515631
Approved by: Ugo Riboni

1284. By Olivier Tilloy on 2015-11-26

Code cleanup: remove unused include statements and forward declarations, and convert unnecessary include statements to forward declarations.

1285. By Olivier Tilloy on 2015-11-26

Prevent click events from propagating through the expanded history view to the view below. Fixes: #1518904
Approved by: Ugo Riboni, PS Jenkins bot

1286. By Olivier Tilloy on 2015-11-26

Use the capture device display names instead of their unique ID. Fixes: #1518931
Approved by: Ugo Riboni, PS Jenkins bot

1287. By Olivier Tilloy on 2015-11-26

Make the drawer menu flickable so that all its actions can be accessed even on a small mobile screen in landscape orientation. Fixes: #1513348

1288. By CI Train Bot Account on 2015-11-26

Releasing 0.23+16.04.20151126-0ubuntu1

1289. By CI Train Bot Account on 2015-11-27

Resync trunk.

1290. By Olivier Tilloy on 2015-11-27

Update translation template.

1291. By Launchpad Translations on behalf of phablet-team on 2015-11-28

Launchpad automatic translations update.

1292. By Launchpad Translations on behalf of phablet-team on 2015-11-29

Launchpad automatic translations update.

1293. By CI Train Bot Account on 2015-11-30

Rebuild against Qt 5.5.1.

1294. By CI Train Bot Account on 2015-11-30

Releasing 0.23+16.04.20151130-0ubuntu1

1295. By CI Train Bot Account on 2015-12-10

Resync trunk.

1296. By Launchpad Translations on behalf of phablet-team on 2015-12-11

Launchpad automatic translations update.

1297. By Launchpad Translations on behalf of phablet-team on 2015-12-12

Launchpad automatic translations update.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1233
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2545/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5856/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1298/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1298/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1298/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5867/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2545/rebuild

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

Looks good, just please revert the change to src/app/webcontainer/local-cookie-store.cpp and ping me to approve it :-)

review: Needs Fixing

[lp:~abreu-alexandre/webbrowser-app/container-handle-context-menu]

1298. By Alexandre Abreu on 2015-12-18

Handle context menu

[Alberto Mardegan (mardy)]

LGTM!

review: Approve

[lp:~abreu-alexandre/webbrowser-app/container-handle-context-menu]

1299. By Alexandre Abreu on 2015-12-18

fix small flake8 nit

=== added file 'src/app/actions/OpenLinkInWebBrowser.qml'
--- src/app/actions/OpenLinkInWebBrowser.qml	1970-01-01 00:00:00 +0000
+++ src/app/actions/OpenLinkInWebBrowser.qml	2015-12-18 18:01:09 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Open link in WebBrowser")
+}

=== added file 'src/app/webcontainer/ContextMenuMobile.qml'
--- src/app/webcontainer/ContextMenuMobile.qml	1970-01-01 00:00:00 +0000
+++ src/app/webcontainer/ContextMenuMobile.qml	2015-12-18 18:01:09 +0000
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
+import Ubuntu.Components.Popups 1.3 as Popups
+import com.canonical.Oxide 1.8 as Oxide
+
+Popups.Dialog {
+    property QtObject contextModel: model
+    property ActionList actions: null
+
+    objectName: "contextMenuMobile"
+
+    QtObject {
+        id: internal
+        readonly property bool isImage: (contextModel.mediaType === Oxide.WebView.MediaTypeImage) ||
+                                        (contextModel.mediaType === Oxide.WebView.MediaTypeCanvas)
+    }
+
+    Row {
+        id: header
+        spacing: units.gu(2)
+        anchors {
+            left: parent.left
+            leftMargin: units.gu(2)
+            right: parent.right
+            rightMargin: units.gu(2)
+        }
+        height: units.gu(2 * title.lineCount + 3)
+        visible: title.text
+
+        Icon {
+            width: units.gu(2)
+            height: units.gu(2)
+            anchors {
+                top: parent.top
+                topMargin: units.gu(2)
+            }
+            name: internal.isImage ? "stock_image" : ""
+            // work around the lack of a standard stock_link symbolic icon in the theme
+            Component.onCompleted: {
+                if (!name) {
+                    source = "assets/stock_link.svg"
+                }
+            }
+        }
+
+        Label {
+            id: title
+            objectName: "titleLabel"
+            text: contextModel.srcUrl.toString() ? contextModel.srcUrl : contextModel.linkUrl
+            width: parent.width - units.gu(4)
+            anchors {
+                top: parent.top
+                topMargin: units.gu(2)
+                bottom: parent.bottom
+            }
+            fontSize: "x-small"
+            maximumLineCount: 2
+            wrapMode: Text.Wrap
+            height: contentHeight
+        }
+    }
+
+    ListItems.ThinDivider {
+        anchors {
+            left: parent.left
+            leftMargin: units.gu(2)
+            right: parent.right
+            rightMargin: units.gu(2)
+        }
+        visible: header.visible
+    }
+
+    Repeater {
+        model: actions.actions
+        delegate: ListItems.Empty {
+            action: actions.actions[index]
+            objectName: action.objectName + "_item"
+            visible: action.enabled
+            showDivider: false
+
+            height: units.gu(5)
+
+            Label {
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    right: parent.right
+                    rightMargin: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                }
+                fontSize: "x-small"
+                text: action.text
+            }
+
+            ListItems.ThinDivider {
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    right: parent.right
+                    rightMargin: units.gu(2)
+                    bottom: parent.bottom
+                }
+            }
+
+            onTriggered: contextModel.close()
+        }
+    }
+
+    ListItems.Empty {
+        objectName: "cancelAction"
+        height: units.gu(5)
+        showDivider: false
+        Label {
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+                verticalCenter: parent.verticalCenter
+            }
+            fontSize: "x-small"
+            text: i18n.tr("Cancel")
+        }
+        onTriggered: contextModel.close()
+    }
+
+    // adjust default dialog visuals to custom requirements for the context menu
+    Binding {
+        target: __foreground
+        property: "margins"
+        value: 0
+    }
+    Binding {
+        target: __foreground
+        property: "itemSpacing"
+        value: 0
+    }
+}

=== added file 'src/app/webcontainer/ContextMenuWide.qml'
--- src/app/webcontainer/ContextMenuWide.qml	1970-01-01 00:00:00 +0000
+++ src/app/webcontainer/ContextMenuWide.qml	2015-12-18 18:01:09 +0000
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
+import Ubuntu.Components.Popups 1.3 as Popups
+import com.canonical.Oxide 1.8 as Oxide
+
+Popups.Popover {
+    id: contextMenu
+
+    objectName: "contextMenuWide"
+
+    property QtObject contextModel: model
+    property ActionList actions: null
+    property var associatedWebview: null
+
+    QtObject {
+        id: internal
+
+        readonly property int lastEnabledActionIndex: {
+            var last = -1
+            for (var i in actions.actions) {
+                if (actions.actions[i].enabled) {
+                    last = i
+                }
+            }
+            return last
+        }
+
+        readonly property real locationBarOffset: contextMenu.associatedWebview.locationBarController.height
+                                                  + contextMenu.associatedWebview.locationBarController.offset
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: "#ececec"
+    }
+
+    Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        Label {
+            id: titleLabel
+            objectName: "titleLabel"
+            text: contextModel.srcUrl.toString() ? contextModel.srcUrl : contextModel.linkUrl
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
+            height: units.gu(5)
+            visible: text
+            fontSize: "x-small"
+            color: "#888888"
+            elide: Text.ElideRight
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        ListItems.ThinDivider {
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
+            visible: titleLabel.visible
+        }
+
+        Repeater {
+            model: actions.actions
+            delegate: ListItems.Empty {
+                action: actions.actions[index]
+                objectName: action.objectName + "_item"
+                visible: action.enabled
+                showDivider: false
+
+                height: units.gu(5)
+
+                Label {
+                    anchors {
+                        left: parent.left
+                        leftMargin: units.gu(2)
+                        right: parent.right
+                        rightMargin: units.gu(2)
+                        verticalCenter: parent.verticalCenter
+                    }
+                    fontSize: "small"
+                    text: action.text
+                }
+
+                ListItems.ThinDivider {
+                    visible: index < internal.lastEnabledActionIndex
+                    anchors {
+                        left: parent.left
+                        leftMargin: units.gu(2)
+                        right: parent.right
+                        rightMargin: units.gu(2)
+                        bottom: parent.bottom
+                    }
+                }
+
+                onTriggered: contextMenu.hide()
+            }
+        }
+    }
+
+    Item {
+        id: positioner
+        visible: false
+        parent: contextMenu.associatedWebview
+        x: contextModel.position.x
+        y: contextModel.position.y + internal.locationBarOffset
+    }
+    caller: positioner
+
+    onVisibleChanged: {
+        if (!visible) {
+            contextModel.close()
+        }
+    }
+}

=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2015-09-29 17:02:25 +0000
+++ src/app/webcontainer/WebApp.qml	2015-12-18 18:01:09 +0000
@@ -124,6 +124,7 @@
             id: containerWebView
             objectName: "webview"
 
+            wide: webapp.wide
             anchors {
                 left: parent.left
                 right: parent.right

=== modified file 'src/app/webcontainer/WebViewImplOxide.qml'
--- src/app/webcontainer/WebViewImplOxide.qml	2015-08-20 10:42:09 +0000
+++ src/app/webcontainer/WebViewImplOxide.qml	2015-12-18 18:01:09 +0000
@@ -37,6 +37,7 @@
     property url dataPath
     property var popupController
     property var overlayViewsParent: webview.parent
+    property bool wide: false
 
     // Mostly used for testing & avoid external urls to
     //  "leak" in the default browser. External URLs corresponds
@@ -66,53 +67,106 @@
 
     onNewViewRequested: popupController.createPopupView(overlayViewsParent, request, true, context)
 
+    property QtObject contextModel: null
     contextualActions: ActionList {
+        Actions.OpenLinkInWebBrowser {
+            objectName: "OpenLinkInWebBrowser"
+            enabled: contextModel && contextModel.linkUrl.toString()
+            onTriggered: openUrlExternally(contextModel.linkUrl)
+        }
         Actions.CopyLink {
             enabled: webview.contextModel && webview.contextModel.linkUrl.toString()
             onTriggered: Clipboard.push(["text/plain", contextModel.linkUrl.toString()])
+            objectName: "CopyLinkContextualAction"
         }
         Actions.CopyImage {
             enabled: webview.contextModel &&
                      (webview.contextModel.mediaType === Oxide.WebView.MediaTypeImage) &&
                      webview.contextModel.srcUrl.toString()
             onTriggered: Clipboard.push(["text/plain", contextModel.srcUrl.toString()])
+            objectName: "CopyImageContextualAction"
         }
         Actions.Undo {
             enabled: webview.contextModel && webview.contextModel.isEditable &&
                      (webview.contextModel.editFlags & Oxide.WebView.UndoCapability)
             onTriggered: webview.executeEditingCommand(Oxide.WebView.EditingCommandUndo)
+            objectName: "UndoContextualAction"
         }
         Actions.Redo {
             enabled: webview.contextModel && webview.contextModel.isEditable &&
                      (webview.contextModel.editFlags & Oxide.WebView.RedoCapability)
             onTriggered: webview.executeEditingCommand(Oxide.WebView.EditingCommandRedo)
+            objectName: "RedoContextualAction"
         }
         Actions.Cut {
             enabled: webview.contextModel && webview.contextModel.isEditable &&
                      (webview.contextModel.editFlags & Oxide.WebView.CutCapability)
             onTriggered: webview.executeEditingCommand(Oxide.WebView.EditingCommandCut)
+            objectName: "CutContextualAction"
         }
         Actions.Copy {
             enabled: webview.contextModel && webview.contextModel.isEditable &&
                      (webview.contextModel.editFlags & Oxide.WebView.CopyCapability)
             onTriggered: webview.executeEditingCommand(Oxide.WebView.EditingCommandCopy)
+            objectName: "CopyContextualAction"
         }
         Actions.Paste {
             enabled: webview.contextModel && webview.contextModel.isEditable &&
                      (webview.contextModel.editFlags & Oxide.WebView.PasteCapability)
             onTriggered: webview.executeEditingCommand(Oxide.WebView.EditingCommandPaste)
+            objectName: "PasteContextualAction"
         }
         Actions.Erase {
             enabled: webview.contextModel && webview.contextModel.isEditable &&
                      (webview.contextModel.editFlags & Oxide.WebView.EraseCapability)
             onTriggered: webview.executeEditingCommand(Oxide.WebView.EditingCommandErase)
+            objectName: "EraseContextualAction"
         }
         Actions.SelectAll {
             enabled: webview.contextModel && webview.contextModel.isEditable &&
                      (webview.contextModel.editFlags & Oxide.WebView.SelectAllCapability)
             onTriggered: webview.executeEditingCommand(Oxide.WebView.EditingCommandSelectAll)
-        }
-    }
+            objectName: "SelectAllContextualAction"
+        }
+    }
+    function contextMenuOnCompleted(menu) {
+        if (!menu || !menu.contextModel) {
+            return
+        }
+        contextModel = menu.contextModel
+
+        var isImageMediaType =
+                ((contextModel.mediaType === Oxide.WebView.MediaTypeImage) ||
+                 (contextModel.mediaType === Oxide.WebView.MediaTypeCanvas))
+             && contextModel.hasImageContents;
+
+        if (contextModel.linkUrl.toString() ||
+            contextModel.srcUrl.toString() ||
+            contextModel.selectionText ||
+            (contextModel.isEditable && contextModel.editFlags) ||
+            isImageMediaType) {
+            menu.show()
+        } else {
+            contextModel.close()
+        }
+    }
+    Component {
+        id: contextMenuNarrowComponent
+        ContextMenuMobile {
+            actions: contextualActions
+            Component.onCompleted: webview.contextMenuOnCompleted(this)
+        }
+    }
+    Component {
+        id: contextMenuWideComponent
+        ContextMenuWide {
+            associatedWebview: webview
+            parent: browser
+            actions: contextualActions
+            Component.onCompleted: webview.contextMenuOnCompleted(this)
+        }
+    }
+    contextMenu: webview.wide ? contextMenuWideComponent : contextMenuNarrowComponent
 
     StateSaver.properties: "url"
     StateSaver.enabled: !runningLocalApplication

=== modified file 'src/app/webcontainer/WebappContainerWebview.qml'
--- src/app/webcontainer/WebappContainerWebview.qml	2015-08-10 15:22:00 +0000
+++ src/app/webcontainer/WebappContainerWebview.qml	2015-12-18 18:01:09 +0000
@@ -39,9 +39,12 @@
     property url webviewOverrideFile: ""
     property bool blockOpenExternalUrls: false
     property bool runningLocalApplication: false
+    property bool wide: false
 
     signal samlRequestUrlPatternReceived(string urlPattern)
 
+    onWideChanged: if (webappContainerWebViewLoader.item) webappContainerWebViewLoader.item.wide = wide
+
     PopupWindowController {
         id: popupController
         objectName: "popupController"
@@ -87,7 +90,8 @@
                     , blockOpenExternalUrls: containerWebview.blockOpenExternalUrls
                     , runningLocalApplication: containerWebview.runningLocalApplication
                     , popupController: popupController
-                    , overlayViewsParent: containerWebview.parent})
+                    , overlayViewsParent: containerWebview.parent
+                    , wide: containerWebview.wide})
     }
 }
 

=== added file 'src/app/webcontainer/assets/stock_link.svg'
--- src/app/webcontainer/assets/stock_link.svg	1970-01-01 00:00:00 +0000
+++ src/app/webcontainer/assets/stock_link.svg	2015-12-18 18:01:09 +0000
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="insert-link02b.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0931704"
+     inkscape:cx="51.019301"
+     inkscape:cy="39.641321"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4978"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:label="Layer 1"
+         id="layer1-8"
+         transform="matrix(0,-1,-1,0,1394.3622,441.36221)">
+        <rect
+           style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4198"
+           width="90"
+           height="90"
+           x="0"
+           y="962.36218" />
+        <g
+           id="g4978"
+           transform="translate(-60,548.00002)">
+          <rect
+             style="color:#000000;fill:none;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect3038"
+             width="90"
+             height="90"
+             x="0"
+             y="1.7382814e-05"
+             transform="translate(60,414.36216)" />
+          <path
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             d="M 92.075086,472.28711 117.92492,446.43727"
+             id="path4188"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cc" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.99999952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="M 63.667969 9.0371094 C 63.165875 9.0539444 62.671019 9.1114844 62.183594 9.2089844 C 58.284224 9.9890744 55.804541 12.722793 53.650391 14.876953 L 47.1875 21.339844 C 45.03334 23.493994 42.301574 25.973667 41.521484 29.873047 C 41.188085 31.539603 41.327146 33.294372 41.955078 35.121094 L 49.910156 27.164062 C 50.372184 26.657905 50.880803 26.130913 51.429688 25.582031 L 57.892578 19.119141 C 60.046728 16.964991 61.875558 15.389037 63.361328 15.091797 C 63.547048 15.054647 63.742359 15.027806 63.949219 15.017578 C 64.156079 15.007351 64.374492 15.013756 64.607422 15.041016 C 66.005022 15.204646 67.917154 16.153481 70.882812 19.119141 C 74.837032 23.073351 75.205443 25.154865 74.908203 26.640625 C 74.610973 28.126395 73.035009 29.953262 70.880859 32.107422 L 64.419922 38.570312 C 63.865878 39.124359 63.33492 39.635932 62.824219 40.101562 L 54.878906 48.046875 C 56.706268 48.675332 58.461808 48.813981 60.128906 48.480469 C 64.028276 47.700379 66.507959 44.96665 68.662109 42.8125 L 75.125 36.349609 C 77.27915 34.195449 80.010926 31.715786 80.791016 27.816406 C 81.571096 23.917036 79.78641 19.5364 75.125 14.875 C 71.62895 11.37895 68.290852 9.500825 65.195312 9.109375 C 64.679394 9.044135 64.170062 9.0202744 63.667969 9.0371094 z M 31.355469 41.349609 C 30.853375 41.366444 30.358515 41.423984 29.871094 41.521484 C 25.971725 42.301574 23.492043 45.035303 21.337891 47.189453 L 14.875 53.650391 C 12.720847 55.804541 9.9890734 58.286177 9.2089844 62.185547 C 8.4288954 66.084907 10.213595 70.465553 14.875 75.126953 C 19.536407 79.788363 23.917035 81.573059 27.816406 80.792969 C 31.715777 80.012879 34.195456 77.27915 36.349609 75.125 L 42.8125 68.662109 C 44.96665 66.507949 47.698426 64.028286 48.478516 60.128906 C 48.812028 58.461808 48.673379 56.706268 48.044922 54.878906 L 40.109375 62.814453 C 39.641569 63.32819 39.12796 63.862274 38.570312 64.419922 L 32.107422 70.882812 C 29.953269 73.036972 28.124437 74.610973 26.638672 74.908203 C 25.152907 75.205443 23.071405 74.837002 19.117188 70.882812 C 15.162971 66.928594 14.794562 64.847088 15.091797 63.361328 C 15.389032 61.875558 16.964989 60.048681 19.119141 57.894531 L 25.580078 51.431641 C 26.132543 50.879177 26.662506 50.368883 27.171875 49.904297 L 35.119141 41.957031 C 34.361083 41.696439 33.61486 41.514447 32.882812 41.421875 C 32.366891 41.356635 31.857562 41.332774 31.355469 41.349609 z "
+             transform="translate(60.000003,414.36218)"
+             id="path4190" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== modified file 'tests/autopilot/webapp_container/tests/fake_servers.py'
--- tests/autopilot/webapp_container/tests/fake_servers.py	2015-05-27 16:19:45 +0000
+++ tests/autopilot/webapp_container/tests/fake_servers.py	2015-12-18 18:01:09 +0000
@@ -138,6 +138,11 @@
 </html>
         """
 
+    base64_png_data = \
+        "iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAIAAACRXR/mAAAACXBIWXMAAAsTAAALEwE" \
+        "AmpwYAAAAOUlEQVRYw+3OAQ0AAAgDoGv/zlpDN0hATS7qaGlpaWlpaWlpaWlpaWlpaW" \
+        "lpaWlpaWlpaWlpab1qLUGqAWNyFWTYAAAAAElFTkSuQmCC"
+
     def do_GET(self):
         if self.path == '/':
             self.send_response(200)
@@ -151,6 +156,28 @@
         elif self.path == '/with-external-link':
             self.send_response(200)
             self.serve_content(self.external_click_content())
+        elif self.path == "/image":
+            self.send_response(200)
+            html = '<html><body>'
+            html += '<img src="data:image/png;base64,' + self.base64_png_data
+            html += '" style="position: fixed; top: 50%; left: 50%; '
+            html += 'transform: translate(-50%, -50%)" />'
+            html += '</body></html>'
+            self.serve_content(html)
+        elif self.path == "/imagelink":
+            self.send_response(200)
+            html = '<html><body><a href="http://www.ubuntu.com">'
+            html += '<img src="data:image/png;base64,' + self.base64_png_data
+            html += '" style="position: fixed; top: 50%; left: 50%; '
+            html += 'transform: translate(-50%, -50%)" />'
+            html += '</a></body></html>'
+            self.serve_content(html)
+        elif self.path == "/textarea":
+            self.send_response(200)
+            html = '<html><body style="margin: 0">'
+            html += '<textarea style="width: 100%; height: 100%">some text'
+            html += '</textarea></body></html>'
+            self.serve_content(html)
         elif self.path == '/with-targetted-link':
             self.send_response(200)
             self.serve_content(self.targetted_click_content())

=== added file 'tests/autopilot/webapp_container/tests/test_context_menu.py'
--- tests/autopilot/webapp_container/tests/test_context_menu.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/webapp_container/tests/test_context_menu.py	2015-12-18 18:01:09 +0000
@@ -0,0 +1,189 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import time
+
+from autopilot.platform import model
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals, StartsWith
+
+from webapp_container.tests import WebappContainerTestCaseWithLocalContentBase
+
+import ubuntuuitoolkit as uitk
+
+
+class ContextMenuBase(uitk.UbuntuUIToolkitCustomProxyObjectBase):
+    def get_title_label(self):
+        return self.select_single(objectName="titleLabel")
+
+    def get_visible_actions(self):
+        return self.select_many("Empty", visible=True)
+
+    def get_action(self, objectName):
+        name = objectName + "_item"
+        return self.select_single("Empty", objectName=name)
+
+    def click_action(self, objectName):
+        name = objectName + "_item"
+        action = self.select_single("Empty", visible=True,
+                                    enabled=True, objectName=name)
+        self.pointing_device.click_object(action)
+        self.wait_until_destroyed()
+
+
+class ContextMenuWide(ContextMenuBase):
+    pass
+
+
+class ContextMenuMobile(ContextMenuBase):
+    def click_cancel_action(self):
+        action = self.select_single("Empty", objectName="cancelAction")
+        self.pointing_device.click_object(action)
+
+
+class TestContextMenuBase(WebappContainerTestCaseWithLocalContentBase):
+    data_uri_prefix = "data:image/png;base64,"
+
+    def _get_context_menu(self):
+        if self.get_webcontainer_webview().wide:
+            return self.app.wait_select_single(
+                ContextMenuWide,
+                objectName="contextMenuWide")
+        else:
+            return self.app.wait_select_single(
+                ContextMenuMobile,
+                objectName="contextMenuMobile")
+
+    def _open_context_menu(self):
+        webview = self.get_webview()
+        x = webview.globalRect.x + webview.globalRect.width // 2
+        y = webview.globalRect.y + webview.globalRect.height // 2
+        self.pointing_device.move(x, y)
+        if model() == 'Desktop':
+            self.pointing_device.click(button=3)
+        else:
+            self.pointing_device.press()
+            time.sleep(1.5)
+            self.pointing_device.release()
+        return self._get_context_menu()
+
+    def _dismiss_context_menu(self, menu):
+        if self.get_webcontainer_webview().wide:
+            # Dismiss by clicking outside of the menu
+            webview_rect = self.get_webview().globalRect
+            actions = menu.get_visible_actions()
+            outside_x = (webview_rect.x + actions[0].globalRect.x) // 2
+            outside_y = webview_rect.y + webview_rect.height // 2
+            self.pointing_device.move(outside_x, outside_y)
+            self.pointing_device.click()
+        else:
+            # Dismiss by clicking the cancel action
+            menu.click_cancel_action()
+        menu.wait_until_destroyed()
+
+    def setUp(self, path):
+        super(TestContextMenuBase, self).setUp()
+        args = []
+        self.launch_webcontainer_app_with_local_http_server(
+            args,
+            path,
+            {'WEBAPP_CONTAINER_BLOCK_OPEN_URL_EXTERNALLY': '1'})
+        self.get_webcontainer_window().visible.wait_for(True)
+        self.menu = self._open_context_menu()
+
+
+class TestContextMenuLink(TestContextMenuBase):
+
+    def setUp(self):
+        super(TestContextMenuLink, self).setUp(path="/with-external-link")
+        self.assertThat(self.menu.get_title_label().text,
+                        Equals("http://www.ubuntu.com/"))
+
+    def test_open_link_(self):
+        main_webview = self.get_oxide_webview()
+        signal = main_webview.watch_signal(
+            'openExternalUrlTriggered(QString)')
+        self.assertThat(signal.was_emitted, Equals(False))
+
+        self.menu.click_action("OpenLinkInWebBrowser")
+
+        self.assertThat(lambda: signal.was_emitted, Eventually(Equals(True)))
+        self.assertThat(signal.num_emissions, Equals(1))
+
+    def test_copy_link(self):
+        self.menu.click_action("CopyLinkContextualAction")
+
+
+class TestContextMenuImage(TestContextMenuBase):
+
+    def setUp(self):
+        super(TestContextMenuImage, self).setUp(path="/image")
+        self.assertThat(self.menu.get_title_label().text,
+                        StartsWith(self.data_uri_prefix))
+
+    def test_copy_image(self):
+        # There is no easy way to test the contents of the clipboard,
+        # but we can at least verify that the context menu was dismissed.
+        self.menu.click_action("CopyImageContextualAction")
+
+
+class TestContextMenuImageAndLink(TestContextMenuBase):
+
+    def setUp(self):
+        super(TestContextMenuImageAndLink, self).setUp(path="/imagelink")
+        self.assertThat(self.menu.get_title_label().text,
+                        StartsWith(self.data_uri_prefix))
+
+    def test_open_link_in_webbrowser(self):
+        main_webview = self.get_oxide_webview()
+        signal = main_webview.watch_signal(
+            'openExternalUrlTriggered(QString)')
+        self.assertThat(signal.was_emitted, Equals(False))
+
+        self.menu.click_action("OpenLinkInWebBrowser")
+
+        self.assertThat(lambda: signal.was_emitted, Eventually(Equals(True)))
+        self.assertThat(signal.num_emissions, Equals(1))
+
+    def test_copy_link(self):
+        # There is no easy way to test the contents of the clipboard,
+        # but we can at least verify that the context menu was dismissed.
+        self.menu.click_action("CopyLinkContextualAction")
+
+    def test_copy_image(self):
+        # There is no easy way to test the contents of the clipboard,
+        # but we can at least verify that the context menu was dismissed.
+        self.menu.click_action("CopyImageContextualAction")
+
+
+class TestContextMenuTextArea(TestContextMenuBase):
+
+    def setUp(self):
+        super(TestContextMenuTextArea, self).setUp(path="/textarea")
+        self.assertThat(self.menu.get_title_label().visible, Equals(False))
+
+    def test_actions(self):
+        actions = ["SelectAll",
+                   "Cut",
+                   "Undo",
+                   "Redo",
+                   "Paste",
+                   "SelectAll",
+                   "Copy",
+                   "Erase"]
+        for action in actions:
+            self.menu.click_action("{}ContextualAction".format(action))
+            self.menu = self._open_context_menu()