Merge lp:~abreu-alexandre/webbrowser-app/support-oxide-and-qtwebkit into lp:~osomon/webbrowser-app/with-oxide

[Alexandre Abreu]

Make the webapp-container adaptable to the runtime context (oxide or not) and instanciate the proper web backend. To account for the multiple potential frameworks (13.10, and soon 14.04) and avoid 1. user having their webapps not working anymore, 2. asking user to update their click package, a bit of runtime behavior has been added (ack'd by Jamie Strandboge) to validate the presence of oxide,

Make the webapp-container adaptable to the runtime context (oxide or not) and instanciate the proper web backend. To account for the multiple potential frameworks (13.10, and soon 14.04) and avoid 1. user having their webapps not working anymore, 2. asking user to update their click package, a bit of runtime behavior has been added (ack'd by Jamie Strandboge) to validate the presence of oxide,

[lp:~abreu-alexandre/webbrowser-app/support-oxide-and-qtwebkit]

488. By Alexandre Abreu on 2014-03-26

merge trunk

489. By Alexandre Abreu on 2014-03-26

fixes

490. By Alexandre Abreu on 2014-03-26

Add build deps

[Olivier Tilloy (osomon)]

A couple of general remarks before I dive in the code more seriously:

 - could you please get rid of the ComponentCreation parameter, thus making the instantiation of the component always a 2-step process? I don’t think we’re gaining anything from having two separate code paths there. See https://code.launchpad.net/~mardy/webbrowser-app/add-onlineaccount-support-for-container2/+merge/211701 where Alberto did that

 - the runtime dep on libqt5webkit5-qmlwebkitplugin should be added to webapp-container, not webbrowser-app

 - detecting the architecture would probably be more reliable by testing the definition of Q_PROCESSOR_X86_32, Q_PROCESSOR_X86_64, and Q_PROCESSOR_ARM (include <QtCore/QtGlobal> to make use of them)

 - out of curiosity, wouldn’t using the QFile API work to test whether we can access the oxide-renderer binary?

review: Needs Fixing

[lp:~abreu-alexandre/webbrowser-app/support-oxide-and-qtwebkit]

491. By Alexandre Abreu on 2014-03-27

fixes

[Olivier Tilloy (osomon)]

At line 33 of the diff, an extra blank line was added, can it be reverted?

[Olivier Tilloy (osomon)]

563 +#include <unistd.h>

Is this include statement really needed?

[Olivier Tilloy (osomon)]

In WebappContainer::withOxide(), what about adding recognition for a "--oxide" flag to force the use of oxide, for testing purposes (that would be handy for me on my development workstation where I don’t have oxide installed system-wide - I use a locally compiled version) ?

[Olivier Tilloy (osomon)]

632 + // to update its app or change somehting in the Exec args.

typo: s/somehting/something/

[Olivier Tilloy (osomon)]

In WebappContainer::withOxide(), can you make the comment extra explicit by explaining that this works under confinement because version 1.1 of the ubuntu apparmor policy allows access to this file, whereas version 1.0 knows only of QtWebKit.

I just want to make sure when I read this code again in 6 months from now I’ll understand right away why we wrote it and how it works.

[lp:~abreu-alexandre/webbrowser-app/support-oxide-and-qtwebkit]

492. By Alexandre Abreu on 2014-03-27

fixes

[Alexandre Abreu (abreu-alexandre)]

> At line 33 of the diff, an extra blank line was added, can it be reverted?
done

[Alexandre Abreu (abreu-alexandre)]

> In WebappContainer::withOxide(), can you make the comment extra explicit by
> explaining that this works under confinement because version 1.1 of the ubuntu
> apparmor policy allows access to this file, whereas version 1.0 knows only of
> QtWebKit.
>
> I just want to make sure when I read this code again in 6 months from now I’ll
> understand right away why we wrote it and how it works.

done

[Alexandre Abreu (abreu-alexandre)]

> 632 + // to update its app or change somehting in the Exec args.
>
> typo: s/somehting/something/

done

[Alexandre Abreu (abreu-alexandre)]

> 563 +#include <unistd.h>
>
> Is this include statement really needed?

done

[Olivier Tilloy (osomon)]

This doesn’t work here on my device: I’ve installed packages built from this branch (which pulled in oxide), and running a webapp that has version 1.0 of the policy fails, I’m seeing this in the log:

    Using Oxide as the web engine backend

and then:

    LaunchProcess: failed to execvp:
    /usr/lib/arm-linux-gnueabihf/oxide-qt/chrome-sandbox

QFile::exists() is probably not good enough to check access rights.
I have tried the following:

    return QFile(oxideHintLocation).open(QIODevice::ReadOnly);

which is closer to your original solution, but I’m still getting the same issue. Could it be that version 1.0 of the policy doesn’t prevent from reading this file? Can you check with Jamie?

review: Needs Fixing

[Jamie Strandboge (jdstrand)]

So, 1.0 of the policy doesn't block the access. I'll update the apparmor-easyprof-ubuntu policy to make sure it does.

[lp:~abreu-alexandre/webbrowser-app/support-oxide-and-qtwebkit]

493. By Alexandre Abreu on 2014-03-28

simplify oxide detection

[Olivier Tilloy (osomon)]

currentArchitecturePathName() should probably be marked static.

[Olivier Tilloy (osomon)]

441 + id: webview

this id seems to be unused

[Olivier Tilloy (osomon)]

457 + toolbar: panel.panel

This doesn’t look correct. Shouldn’t it be:

    toolbar: containerWebview.toolbar

[lp:~abreu-alexandre/webbrowser-app/support-oxide-and-qtwebkit]

494. By Alexandre Abreu on 2014-03-28

Fixes

[Olivier Tilloy (osomon)]

287 + experimental.preferences.developerExtrasEnabled: developerExtrasEnabled

"developerExtrasEnabled" is not defined in this context (this might actually work because it is defined in a parent context, but it breaks encapsulation, thus making the code hard to read and to maintain).
Can you make it a property of the WebViewImplWebkit and ensure it’s set from the caller?

[lp:~abreu-alexandre/webbrowser-app/support-oxide-and-qtwebkit]

495. By Alexandre Abreu on 2014-03-28

Fixes

496. By Alexandre Abreu on 2014-03-28

Fixes

[Olivier Tilloy (osomon)]

In src/app/webcontainer/WebApp.qml:

    property alias developerExtrasEnabled: webview.developerExtrasEnabled

I don’t think this will work, because WebApp is an instance of BrowserView which already defines a top-level "developerExtrasEnabled" property.

[lp:~abreu-alexandre/webbrowser-app/support-oxide-and-qtwebkit]

497. By Alexandre Abreu on 2014-03-28

Fix developer extra enabled

[Alexandre Abreu (abreu-alexandre)]

> In src/app/webcontainer/WebApp.qml:
>
> property alias developerExtrasEnabled: webview.developerExtrasEnabled
>
> I don’t think this will work, because WebApp is an instance of BrowserView
> which already defines a top-level "developerExtrasEnabled" property.

right, done

=== modified file 'debian/control'
--- debian/control	2014-03-18 15:18:34 +0000
+++ debian/control	2014-03-28 16:05:34 +0000
@@ -51,6 +51,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          unity-webapps-qml,
+         libqt5webkit5-qmlwebkitplugin, 
          webbrowser-app (= ${binary:Version}),
 Description: Ubuntu web applications container
  A lightweight webapps container tailored for Ubuntu, based on the Webkit

=== modified file 'src/app/browserapplication.cpp'
--- src/app/browserapplication.cpp	2014-03-17 22:16:59 +0000
+++ src/app/browserapplication.cpp	2014-03-28 16:05:34 +0000
@@ -140,7 +140,7 @@
     m_webbrowserWindowProxy = new WebBrowserWindow();
     context->setContextProperty("webbrowserWindowProxy", m_webbrowserWindowProxy);
 
-    QObject* browser = m_component->create();
+    QObject* browser = m_component->beginCreate(context);
     m_window = qobject_cast<QQuickWindow*>(browser);
     m_webbrowserWindowProxy->setWindow(m_window);
 

=== modified file 'src/app/browserapplication.h'
--- src/app/browserapplication.h	2014-03-17 22:16:59 +0000
+++ src/app/browserapplication.h	2014-03-28 16:05:34 +0000
@@ -49,11 +49,11 @@
     QStringList m_arguments;
     QQmlEngine* m_engine;
     QQuickWindow* m_window;
+    QQmlComponent* m_component;
 
 private:
     QString appId() const;
 
-    QQmlComponent* m_component;
     WebBrowserWindow *m_webbrowserWindowProxy;
 };
 

=== modified file 'src/app/webbrowser/webbrowser-app.cpp'
--- src/app/webbrowser/webbrowser-app.cpp	2014-03-13 09:04:26 +0000
+++ src/app/webbrowser/webbrowser-app.cpp	2014-03-28 16:05:34 +0000
@@ -89,6 +89,9 @@
         Q_FOREACH(const QUrl& url, urls) {
             QMetaObject::invokeMethod(browser, "newTab", Q_ARG(QVariant, url), Q_ARG(QVariant, true));
         }
+
+        m_component->completeCreate();
+
         return true;
     } else {
         return false;

=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2014-03-26 13:29:24 +0000
+++ src/app/webcontainer/WebApp.qml	2014-03-28 16:05:34 +0000
@@ -27,20 +27,23 @@
 BrowserView {
     id: webapp
 
-    currentWebview: webview
+    currentWebview: webview.currentWebview
 
     property alias url: webview.url
-    property string webappName: ""
+
     property string webappModelSearchPath: ""
-    property var webappUrlPatterns: null
+
+    property alias oxide: webview.withOxide
+    property alias webappName: webview.webappName
+    property alias webappUrlPatterns: webview.webappUrlPatterns
 
     actions: [
         Actions.Back {
-            enabled: backForwardButtonsVisible && currentWebview.canGoBack
+            enabled: backForwardButtonsVisible && webview.currentWebview && webview.currentWebview.canGoBack
             onTriggered: webview.goBack()
         },
         Actions.Forward {
-            enabled: backForwardButtonsVisible && currentWebview.canGoForward
+            enabled: backForwardButtonsVisible && webview.currentWebview && webview.currentWebview.canGoForward
             onTriggered: webview.goForward()
         },
         Actions.Reload {
@@ -56,10 +59,8 @@
         // The UITK is trying too hard to be clever about the header and toolbar.
         flickable: null
 
-        WebViewImpl {
+        WebappContainerWebview {
             id: webview
-
-            currentWebview: webview
             toolbar: panel.panel
 
             anchors {
@@ -68,97 +69,17 @@
                 top: parent.top
             }
             height: parent.height - osk.height
-
-            contextualActions: ActionList {
-                Actions.CopyLink {
-                    enabled: webview.contextualData.href.toString()
-                    onTriggered: Clipboard.push([webview.contextualData.href])
-                }
-                Actions.CopyImage {
-                    enabled: webview.contextualData.img.toString()
-                    onTriggered: Clipboard.push([webview.contextualData.img])
-                }
-            }
-
-            function haveValidUrlPatterns() {
-                return webappUrlPatterns && webappUrlPatterns.length !== 0
-            }
-
-            /*function navigationRequestedDelegate(request) {
-                if (!request.isMainFrame) {
-                    request.action = WebView.AcceptRequest
-                    return
-                }
-
-                // Pass-through if we are not running as a named webapp (--webapp='Gmail')
-                // or if we dont have a list of url patterns specified to filter the
-                // browsing actions
-                if ( ! haveValidUrlPatterns() && ! isRunningAsANamedWebapp()) {
-                    request.action = WebView.AcceptRequest
-                    return
-                }
-
-                var action = WebView.IgnoreRequest
-                var url = request.url.toString()
-
-                // The list of url patterns defined by the webapp takes precedence over command line
-                if (isRunningAsANamedWebapp()) {
-                    if (unityWebapps.model.exists(unityWebapps.name) &&
-                        unityWebapps.model.doesUrlMatchesWebapp(unityWebapps.name, url)) {
-                        request.action = WebView.AcceptRequest
-                        return;
-                    }
-                }
-
-                // We still take the possible additional patterns specified in the command line
-                // (the in the case of finer grained ones specifically for the container and not
-                // as an 'install source' for the webapp).
-                if (webappUrlPatterns && webappUrlPatterns.length !== 0) {
-                    for (var i = 0; i < webappUrlPatterns.length; ++i) {
-                        var pattern = webappUrlPatterns[i]
-                        if (url.match(pattern)) {
-                            action = WebView.AcceptRequest
-                            break
-                        }
-                    }
-                }
-
-                request.action = action
-                if (action === WebView.IgnoreRequest) {
-                    console.debug('Opening: ' + url + ' in the browser window.')
-                    Qt.openUrlExternally(url)
-                }
-            }*/
-
-            onNewTabRequested: Qt.openUrlExternally(url)
-
-	    preferences.localStorageEnabled: true
-
-            // Small shim needed when running as a webapp to wire-up connections
-            // with the webview (message received, etc…).
-            // This is being called (and expected) internally by the webapps
-            // component as a way to bind to a webview lookalike without
-            // reaching out directly to its internals (see it as an interface).
-            function getUnityWebappsProxies() {
-                var eventHandlers = {
-                    onAppRaised: function () {
-                        if (webbrowserWindow) {
-                            try {
-                                webbrowserWindow.raise();
-                            } catch (e) {
-                                console.debug('Error while raising: ' + e);
-                            }
-                        }
-                    }
-                };
-                return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview, eventHandlers)
-            }
+            developerExtrasEnabled: webapp.developerExtrasEnabled
         }
 
         ErrorSheet {
             anchors.fill: webview
-            visible: webview.lastLoadFailed
-            url: webview.url
+            visible: {
+                if (webview.lastLoadFailed !== undefined)
+                    return webview.lastLoadFailed
+                return webview.currentWebview && webview.currentWebview.lastLoadFailed
+            }
+            url: webview.currentWebview.url
             onRefreshClicked: webview.reload()
         }
     }
@@ -166,7 +87,7 @@
     PanelLoader {
         id: panel
 
-        currentWebview: webview
+        currentWebview: webview.currentWebview
         chromeless: webapp.chromeless
 
         backForwardButtonsVisible: webapp.backForwardButtonsVisible
@@ -183,12 +104,8 @@
     UnityWebApps.UnityWebApps {
         id: unityWebapps
         name: webappName
-        bindee: currentWebview
+        bindee: webview.currentWebview
         actionsContext: actionManager.globalContext
         model: UnityWebApps.UnityWebappsAppModel { searchPath: webappModelSearchPath }
     }
-
-    function isRunningAsANamedWebapp() {
-        return webappName && typeof(webappName) === 'string' && webappName.length != 0
-    }
 }

=== added file 'src/app/webcontainer/WebViewImplWebkit.qml'
--- src/app/webcontainer/WebViewImplWebkit.qml	1970-01-01 00:00:00 +0000
+++ src/app/webcontainer/WebViewImplWebkit.qml	2014-03-28 16:05:34 +0000
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2013 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.0
+import QtWebKit 3.1
+import QtWebKit.experimental 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Extras.Browser 0.1
+import Ubuntu.UnityWebApps 0.1 as UnityWebApps
+import Ubuntu.Components.Popups 0.1
+import "../actions" as Actions
+import ".."
+
+UbuntuWebView {
+    id: webview
+
+    property bool developerExtrasEnabled: false
+    property var currentWebview: webview
+    property var toolbar: null
+    property string webappName: ""
+    property var webappUrlPatterns: null
+
+    experimental.certificateVerificationDialog: CertificateVerificationDialog {}
+    experimental.authenticationDialog: AuthenticationDialog {}
+    experimental.proxyAuthenticationDialog: ProxyAuthenticationDialog {}
+    experimental.alertDialog: AlertDialog {}
+    experimental.confirmDialog: ConfirmDialog {}
+    experimental.promptDialog: PromptDialog {}
+
+    selectionActions: ActionList {
+        Actions.Copy {
+            onTriggered: selection.copy()
+        }
+    }
+
+    property bool lastLoadFailed: false
+    onLoadingChanged: {
+        lastLoadFailed = (loadRequest.status === WebView.LoadFailedStatus)
+    }
+
+    experimental.preferences.developerExtrasEnabled: developerExtrasEnabled
+
+    experimental.onPermissionRequested: {
+        if (permission.type === PermissionRequest.Geolocation) {
+            if (webview.toolbar) {
+                webview.toolbar.close()
+            }
+            var text = i18n.tr("This page wants to know your device’s location.")
+            PopupUtils.open(Qt.resolvedUrl("PermissionRequest.qml"),
+                            webview.currentWebview,
+                            {"permission": permission, "text": text})
+        }
+        // TODO: handle other types of permission requests
+        // TODO: we might want to store the answer to avoid requesting
+        //       the permission everytime the user visits this site.
+    }
+
+    contextualActions: ActionList {
+        Actions.CopyLink {
+            enabled: webview.contextualData.href.toString()
+            onTriggered: Clipboard.push([webview.contextualData.href])
+        }
+        Actions.CopyImage {
+            enabled: webview.contextualData.img.toString()
+            onTriggered: Clipboard.push([webview.contextualData.img])
+        }
+    }
+
+    function isRunningAsANamedWebapp() {
+        return webview.webappName && typeof(webview.webappName) === 'string' && webview.webappName.length != 0
+    }
+
+    function haveValidUrlPatterns() {
+        return webappUrlPatterns && webappUrlPatterns.length !== 0
+    }
+
+    function navigationRequestedDelegate(request) {
+        if (!request.isMainFrame) {
+            request.action = WebView.AcceptRequest
+            return
+        }
+
+        // Pass-through if we are not running as a named webapp (--webapp='Gmail')
+        // or if we dont have a list of url patterns specified to filter the
+        // browsing actions
+        if ( ! haveValidUrlPatterns() && ! isRunningAsANamedWebapp()) {
+            request.action = WebView.AcceptRequest
+            return
+        }
+
+        var action = WebView.IgnoreRequest
+        var url = request.url.toString()
+
+        // The list of url patterns defined by the webapp takes precedence over command line
+        if (isRunningAsANamedWebapp()) {
+            if (unityWebapps.model.exists(unityWebapps.name) &&
+                unityWebapps.model.doesUrlMatchesWebapp(unityWebapps.name, url)) {
+                request.action = WebView.AcceptRequest
+                return;
+            }
+        }
+
+        // We still take the possible additional patterns specified in the command line
+        // (the in the case of finer grained ones specifically for the container and not
+        // as an 'install source' for the webapp).
+        if (webappUrlPatterns && webappUrlPatterns.length !== 0) {
+            for (var i = 0; i < webappUrlPatterns.length; ++i) {
+                var pattern = webappUrlPatterns[i]
+                if (url.match(pattern)) {
+                    action = WebView.AcceptRequest
+                    break
+                }
+            }
+        }
+
+        request.action = action
+        if (action === WebView.IgnoreRequest) {
+            console.debug('Opening: ' + url + ' in the browser window.')
+            Qt.openUrlExternally(url)
+        }
+    }
+
+    onNewTabRequested: Qt.openUrlExternally(url)
+
+    // Small shim needed when running as a webapp to wire-up connections
+    // with the webview (message received, etc…).
+    // This is being called (and expected) internally by the webapps
+    // component as a way to bind to a webview lookalike without
+    // reaching out directly to its internals (see it as an interface).
+    function getUnityWebappsProxies() {
+        var eventHandlers = {
+            onAppRaised: function () {
+                if (webbrowserWindow) {
+                    try {
+                        webbrowserWindow.raise();
+                    } catch (e) {
+                        console.debug('Error while raising: ' + e);
+                    }
+                }
+            }
+        };
+        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webview, eventHandlers)
+    }
+}

=== added file 'src/app/webcontainer/WebappContainerWebview.qml'
--- src/app/webcontainer/WebappContainerWebview.qml	1970-01-01 00:00:00 +0000
+++ src/app/webcontainer/WebappContainerWebview.qml	2014-03-28 16:05:34 +0000
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2014 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.0
+import Ubuntu.Components 0.1
+import Ubuntu.Unity.Action 1.0 as UnityActions
+import Ubuntu.UnityWebApps 0.1 as UnityWebApps
+import "../actions" as Actions
+import ".."
+
+Item {
+    id: containerWebview
+
+    property string url: ""
+    property bool withOxide: false
+    property bool developerExtrasEnabled: false
+    property string webappName: ""
+    property var currentWebview: webappContainerWebViewLoader.item
+    property var toolbar: null
+    property var webappUrlPatterns: null
+
+    Loader {
+        id: webappContainerWebViewLoader
+        anchors.fill: parent
+        sourceComponent: withOxide ? webappContainerWebViewOxide : webappContainerWebViewWebkit
+    }
+
+    Component {
+        id: webappContainerWebViewWebkit
+
+        WebViewImplWebkit {
+            toolbar: containerWebview.toolbar
+            url: containerWebview.url
+            webappName: containerWebview.webappName
+            webappUrlPatterns: containerWebview.webappUrlPatterns
+            developerExtrasEnabled: containerWebview.developerExtrasEnabled
+        }
+    }
+
+    Component {
+        id: webappContainerWebViewOxide
+
+        WebViewImpl {
+            id: webview
+
+            url: containerWebview.url
+            currentWebview: webview
+            toolbar: containerWebview.toolbar
+
+            contextualActions: ActionList {
+                Actions.CopyLink {
+                    enabled: webview.contextualData.href.toString()
+                    onTriggered: Clipboard.push([webview.contextualData.href])
+                }
+                Actions.CopyImage {
+                    enabled: webview.contextualData.img.toString()
+                    onTriggered: Clipboard.push([webview.contextualData.img])
+                }
+            }
+
+            function haveValidUrlPatterns() {
+                return webappUrlPatterns && webappUrlPatterns.length !== 0
+            }
+
+            /*function navigationRequestedDelegate(request) {
+                if (!request.isMainFrame) {
+                    request.action = WebView.AcceptRequest
+                    return
+                }
+
+                // Pass-through if we are not running as a named webapp (--webapp='Gmail')
+                // or if we dont have a list of url patterns specified to filter the
+                // browsing actions
+                if ( ! haveValidUrlPatterns() && ! isRunningAsANamedWebapp()) {
+                    request.action = WebView.AcceptRequest
+                    return
+                }
+
+                var action = WebView.IgnoreRequest
+                var url = request.url.toString()
+
+                // The list of url patterns defined by the webapp takes precedence over command line
+                if (isRunningAsANamedWebapp()) {
+                    if (unityWebapps.model.exists(unityWebapps.name) &&
+                        unityWebapps.model.doesUrlMatchesWebapp(unityWebapps.name, url)) {
+                        request.action = WebView.AcceptRequest
+                        return;
+                    }
+                }
+
+                // We still take the possible additional patterns specified in the command line
+                // (the in the case of finer grained ones specifically for the container and not
+                // as an 'install source' for the webapp).
+                if (webappUrlPatterns && webappUrlPatterns.length !== 0) {
+                    for (var i = 0; i < webappUrlPatterns.length; ++i) {
+                        var pattern = webappUrlPatterns[i]
+                        if (url.match(pattern)) {
+                            action = WebView.AcceptRequest
+                            break
+                        }
+                    }
+                }
+
+                request.action = action
+                if (action === WebView.IgnoreRequest) {
+                    console.debug('Opening: ' + url + ' in the browser window.')
+                    Qt.openUrlExternally(url)
+                }
+            }*/
+
+            onNewTabRequested: Qt.openUrlExternally(url)
+
+            preferences.localStorageEnabled: true
+
+            // Small shim needed when running as a webapp to wire-up connections
+            // with the webview (message received, etc…).
+            // This is being called (and expected) internally by the webapps
+            // component as a way to bind to a webview lookalike without
+            // reaching out directly to its internals (see it as an interface).
+            function getUnityWebappsProxies() {
+                var eventHandlers = {
+                    onAppRaised: function () {
+                        if (webbrowserWindow) {
+                            try {
+                                webbrowserWindow.raise();
+                            } catch (e) {
+                                console.debug('Error while raising: ' + e);
+                            }
+                        }
+                    }
+                };
+                return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview, eventHandlers)
+            }
+        }
+    }
+}

=== modified file 'src/app/webcontainer/webapp-container.cpp'
--- src/app/webcontainer/webapp-container.cpp	2014-03-20 18:17:12 +0000
+++ src/app/webcontainer/webapp-container.cpp	2014-03-28 16:05:34 +0000
@@ -24,10 +24,32 @@
 // Qt
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
+#include <QtCore/QFile>
 #include <QtCore/QFileInfo>
+#include <QtCore/QtGlobal>
 #include <QtCore/QRegularExpression>
 #include <QtCore/QTextStream>
 #include <QtQuick/QQuickWindow>
+#include <QtQml/QQmlComponent>
+
+
+namespace
+{
+
+QString currentArchitecturePathName()
+{
+#if defined(Q_PROCESSOR_X86_32)
+    return QLatin1String("i386-linux-gnu");
+#elif defined(Q_PROCESSOR_X86_64)
+    return QLatin1String("x86_64-linux-gnu");
+#elif defined(Q_PROCESSOR_ARM)
+    return QLatin1String("arm-linux-gnueabihf");
+#else
+#error Unable to determine target architecture
+#endif
+}
+
+}
 
 WebappContainer::WebappContainer(int& argc, char** argv)
     : BrowserApplication(argc, argv)
@@ -50,7 +72,13 @@
         m_window->setProperty("webappName", name);
         m_window->setProperty("backForwardButtonsVisible", m_arguments.contains("--enable-back-forward"));
         m_window->setProperty("addressBarVisible", m_arguments.contains("--enable-addressbar"));
+
+        bool oxide = withOxide();
+        qDebug() << "Using" << (oxide ? "Oxide" : "QtWebkit") << "as the web engine backend";
+        m_window->setProperty("oxide", oxide);
+
         m_window->setProperty("webappUrlPatterns", webappUrlPatterns());
+
         // When a webapp is being launched by name, the URL is pulled from its 'homepage'.
         if (name.isEmpty()) {
             QList<QUrl> urls = this->urls();
@@ -58,6 +86,9 @@
                 m_window->setProperty("url", urls.first());
             }
         }
+
+        m_component->completeCreate();
+
         return true;
     } else {
         return false;
@@ -84,6 +115,31 @@
     out << "  --enable-addressbar                 enable the display of the address bar" << endl;
 }
 
+bool WebappContainer::withOxide() const
+{
+    Q_FOREACH(const QString& argument, m_arguments) {
+        if (argument == "--webkit") {
+            // force webkit
+            return false;
+        }
+        if (argument == "--oxide") {
+            // force oxide
+            return true;
+        }
+    }
+
+    // Use a runtime hint to transparently know if oxide
+    // can be used as a backend without the user/dev having
+    // to update its app or change something in the Exec args.
+    // Version 1.1 of ubuntu apparmor policy allows this file to
+    // be accessed whereas v1.0 only knows about qtwebkit.
+    QString oxideHintLocation =
+        QString("/usr/lib/%1/oxide-qt/oxide-renderer")
+            .arg(currentArchitecturePathName());
+
+    return QFile(oxideHintLocation).open(QIODevice::ReadOnly);
+}
+
 QString WebappContainer::webappModelSearchPath() const
 {
     Q_FOREACH(const QString& argument, m_arguments) {

=== modified file 'src/app/webcontainer/webapp-container.h'
--- src/app/webcontainer/webapp-container.h	2014-03-14 14:51:22 +0000
+++ src/app/webcontainer/webapp-container.h	2014-03-28 16:05:34 +0000
@@ -39,6 +39,7 @@
     QString webappModelSearchPath() const;
     QString webappName() const;
     QStringList webappUrlPatterns() const;
+    bool withOxide() const;
 };
 
 #endif // __WEBAPP_CONTAINER_H__

=== modified file 'src/app/webcontainer/webapp-container.qml'
--- src/app/webcontainer/webapp-container.qml	2014-03-17 10:16:11 +0000
+++ src/app/webcontainer/webapp-container.qml	2014-03-28 16:05:34 +0000
@@ -30,6 +30,7 @@
     property alias webappName: browser.webappName
     property alias webappModelSearchPath: browser.webappModelSearchPath
     property alias webappUrlPatterns: browser.webappUrlPatterns
+    property alias oxide: browser.oxide
 
     contentOrientation: browser.screenOrientation