Merge lp:~abreu-alexandre/ubuntu-html5-theme/backport-oxide-fixes-14.09 into lp:ubuntu-html5-theme/rtm-14.09

[Alexandre Abreu]

Fix oxide bindings, fix content hub apis

Fix oxide bindings, fix content hub apis

[lp:~abreu-alexandre/ubuntu-html5-theme/backport-oxide-fixes-14.09]

185. By Alexandre Abreu on 2014-12-10

add --oxide flag

186. By Alexandre Abreu on 2014-12-10

fixes

187. By Alexandre Abreu on 2014-12-10

fixes

188. By Alexandre Abreu on 2014-12-12

add oxide hw compositiing support; remove clutter

189. By Alexandre Abreu on 2014-12-12

fix compilation

190. By Alexandre Abreu on 2014-12-16

updates

191. By Alexandre Abreu on 2014-12-16

cleanup oxide

192. By Alexandre Abreu on 2015-01-08

add --oxide

193. By Alexandre Abreu on 2015-01-09

oxide only bits

Unmerged revisions

193. By Alexandre Abreu on 2015-01-09

oxide only bits

192. By Alexandre Abreu on 2015-01-08

add --oxide

191. By Alexandre Abreu on 2014-12-16

cleanup oxide

190. By Alexandre Abreu on 2014-12-16

updates

189. By Alexandre Abreu on 2014-12-12

fix compilation

188. By Alexandre Abreu on 2014-12-12

add oxide hw compositiing support; remove clutter

187. By Alexandre Abreu on 2014-12-10

fixes

186. By Alexandre Abreu on 2014-12-10

fixes

185. By Alexandre Abreu on 2014-12-10

add --oxide flag

184. By Alexandre Abreu on 2014-12-08

Fix oxide bindings, fix content hub apis

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-12-08 18:08:39 +0000
+++ CMakeLists.txt	2015-01-09 00:53:11 +0000
@@ -13,6 +13,7 @@
 endif()
 
 find_package(Qt5Core REQUIRED)
+find_package(Qt5Gui REQUIRED)
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5Quick REQUIRED)
 
@@ -26,5 +27,9 @@
 add_custom_target(uninstall
     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
 
+# make non compiled files (QML, JS, images, etc.) visible in QtCreator
+file(GLOB_RECURSE NON_COMPILED_FILES *.qml *.js *.png *.py *.pot *.po *.qdoc *.qdocconf *.css *.html)
+add_custom_target(NON_COMPILED_TARGET ALL SOURCES ${NON_COMPILED_FILES})
+
 add_subdirectory(src)
 add_subdirectory(tests)

=== modified file 'debian/control'
--- debian/control	2014-12-08 18:08:39 +0000
+++ debian/control	2015-01-09 00:53:11 +0000
@@ -4,8 +4,7 @@
 Maintainer: Michael Hall <[e-mail]>
 Build-Depends: cmake (>= 2.8.9),
                debhelper (>= 9),
-               libqt5webkit5-dev,
-               qml-module-qtwebkit,
+               liboxideqt-qmlplugin (>= 1.2.0),
                python (>= 2.7),
                python-setuptools,
                qt5-default,
@@ -13,6 +12,7 @@
                qtbase5-dev,
                qtbase5-private-dev,
                qtdeclarative5-dev,
+               qtdeclarative5-private-dev,
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
 Standards-Version: 3.9.5
@@ -48,7 +48,7 @@
 Package: ubuntu-html5-ui-toolkit-examples
 Architecture: all
 Depends: libjs-jquery,
-         qml-module-qtwebkit,
+         liboxideqt-qmlplugin (>= 1.2.0),
          qmlscene,
          qtdeclarative5-qtquick2-plugin,
          ubuntu-html5-ui-toolkit (= ${binary:Version}),
@@ -66,7 +66,7 @@
          libautopilot-qt (>= 1.4),
          libjs-jquery,
          libqt5test5,
-         qml-module-qtwebkit,
+         liboxideqt-qmlplugin (>= 1.2.0),
          python-xlib,
          qmlscene,
          qtdeclarative5-qtquick2-plugin,
@@ -84,12 +84,13 @@
 Package: ubuntu-html5-container
 Architecture: any
 Multi-Arch: foreign
-Depends: qml-module-qtwebkit,
+Depends: liboxideqt-qmlplugin (>= 1.3.5),
+         qml-module-qtwebkit,
          qmlscene,
          qtdeclarative5-cordova-2.8-plugin,
          qtdeclarative5-qtquick2-plugin,
+         qtdeclarative5-ubuntu-web-plugin,
          qtdeclarative5-ubuntu-ui-extras-browser-plugin,
-         ubuntu-html5-ui-toolkit (= ${source:Version}),
          unity-webapps-qml (>= 0.1+14.04.20131106-0ubuntu2),
          ${misc:Depends},
          ${python:Depends},
@@ -102,7 +103,6 @@
 Architecture: all
 Depends: libautopilot-qt (>= 1.4),
          libqt5test5,
-         qml-module-qtwebkit,
          qtdeclarative5-qtquick2-plugin,
          ubuntu-html5-container (>= ${binary:Version}),
          ${misc:Depends},

=== removed file 'src/plugin/Ubuntu/WebApps/CordovaLoader.qml'
--- src/plugin/Ubuntu/WebApps/CordovaLoader.qml	2014-12-08 18:08:39 +0000
+++ src/plugin/Ubuntu/WebApps/CordovaLoader.qml	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This file is part of ubuntu-html5-ui-toolkit.
- *
- * ubuntu-html5-ui-toolkit 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.
- *
- * ubuntu-html5-ui-toolkit 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
-
-Item {
-    id: root
-
-    property string htmlIndexDirectory
-
-    // Cordova plugin instance
-    property var cordovaInstance: null
-
-    // the cordova qml instance was created successfully
-    signal created();
-
-    // an error occured while creating the cordova instance
-    signal creationError();
-
-    function _tryCreateObject(statement, parent) {
-        var result = null;
-        try {
-            result = Qt.createQmlObject(statement, parent);
-        }
-        catch (e) {};
-
-        return result;
-    }
-
-    function _getCordovaObjectCreationStatementFor(version, params) {
-        return 'import CordovaUbuntu '
-                + version
-                + '; CordovaView { '
-                + ' anchors.fill: parent; '
-                + params + ';'
-                + '}';
-    }
-
-    function _tryCreateCordovaObject(version, params) {
-        var _params = params || '';
-        return _tryCreateObject(_getCordovaObjectCreationStatementFor(version, params), root);
-    }
-
-    function _ensureCordovaInitDone() {
-        if (cordovaInstance && htmlIndexDirectory.length !== 0) {
-            cordovaInstance.wwwDir = htmlIndexDirectory;
-        }
-    }
-
-    onHtmlIndexDirectoryChanged: _ensureCordovaInitDone()
-
-    Component.onCompleted: {
-        // selectively try to load cordova
-        var cordova = null;
-
-        var candidates = [{version: '3.4', paramString: 'contentFile: "index.html"'}];
-        for (var i = 0; i < candidates.length; ++i) {
-            cordova = _tryCreateCordovaObject(candidates[i].version,
-                                              candidates[i].paramString);
-            if (cordova)
-                break;
-        }
-
-        if ( ! cordova) {
-            console.error('Cannot create CordovaView object.');
-            creationError();
-            return;
-        }
-
-        root.cordovaInstance = cordova;
-
-        _ensureCordovaInitDone();
-
-        created();
-    }
-}

=== removed file 'src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml'
--- src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml	2014-12-08 18:08:39 +0000
+++ src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This file is part of ubuntu-html5-container.
- *
- * ubuntu-html5-container 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.UnityWebApps 0.1
-
-
-Item {
-    id: root
-
-    property var bindingMainWebview: null
-
-    /*!
-      \internal
-     */
-    function getUnityWebappsProxies() {
-        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(bindingMainWebview);
-    }
-
-    /*!
-      \internal
-     */
-    Loader {
-        id: webappBindingsLoader
-        visible: false
-        anchors.fill: parent
-        sourceComponent: bindingMainWebview ? webappBindingsComponent : undefined
-    }
-
-    /*!
-      \internal
-     */
-    Component {
-        id: webappBindingsComponent
-
-        UnityWebApps {
-            id: webapps
-            bindee: root
-            injectExtraUbuntuApis: true
-            requiresInit: false
-        }
-    }
-}
-

=== modified file 'src/plugin/Ubuntu/WebApps/WebAppContainer.qml'
--- src/plugin/Ubuntu/WebApps/WebAppContainer.qml	2014-12-08 18:08:39 +0000
+++ src/plugin/Ubuntu/WebApps/WebAppContainer.qml	2015-01-09 00:53:11 +0000
@@ -18,8 +18,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.Extras.Browser 0.1
-
+import Ubuntu.UnityWebApps 0.1
 
 /*!
     \qmltype WebAppContainer
@@ -30,17 +29,31 @@
 MainView {
     id: root
     objectName: "root"
+
     anchorToKeyboard: true
     automaticOrientation: true
 
     /*!
       \preliminary
+      The property defines if oxide is to be used as the webengine backend.
+      */
+    property bool oxide: true
+
+    /*!
+      \preliminary
       The property holds the path to the filesystem location where the 'index.html'
       file can be found (root of the HTML5 application).
 
       The path is absolute or relative to the current dir.
       */
-    property alias htmlIndexDirectory: cordovaWebviewProvider.htmlIndexDirectory
+    property string htmlIndexDirectory: ""
+
+    /*!
+      \preliminary
+      The properties hold whether the remote debugging interface should be enabled for the
+      Web View. The host ip and port for accessing the remote interface should be provided.
+      */
+    property bool remoteInspectorEnabled: false
 
     Page {
         id: mainPage
@@ -49,41 +62,6 @@
         /*!
           \internal
          */
-        CordovaLoader {
-            id: cordovaWebviewProvider
-            anchors.fill: parent
-            onCreationError: {
-                mainPage._onCordovaCreationError();
-            }
-            onCreated: {
-                bindings.bindingMainWebview = Qt.binding(function() {
-                    return cordovaInstance.mainWebview;
-                });
-            }
-        }
-
-        /*!
-          \internal
-         */
-        function _onCordovaCreationError() {
-            mainPage._fallbackToWebview();
-        }
-
-        /*!
-          \internal
-         */
-        function _fallbackToWebview() {
-            console.debug('Falling back on the plain Webview backend.')
-
-            webviewFallbackComponentLoader.sourceComponent = Qt.binding(function() {
-                return root.htmlIndexDirectory.length !== 0
-                        ? webviewFallbackComponent : null;
-            });
-        }
-
-        /*!
-          \internal
-         */
         function _getAppStartupIndexFileUri() {
             return 'file://' + root.htmlIndexDirectory + '/index.html';
         }
@@ -92,46 +70,55 @@
           \internal
          */
         Loader {
-            id: webviewFallbackComponentLoader
+            id: webviewComponentLoader
             anchors.fill: parent
             onLoaded: {
-                bindings.bindingMainWebview = item;
+                webappBindingsLoader.sourceComponent = webappBindingsComponent
             }
         }
 
+        Component.onCompleted: {
+            var webview = oxide ?
+                Qt.resolvedUrl("WebViewOxide.qml")
+                : Qt.resolvedUrl("WebViewWebkit.qml");
+            webviewComponentLoader.setSource(webview, {
+                remoteInspectorEnabled: root.remoteInspectorEnabled});
+        }
+
+        /*!
+          \internal
+         */
+        function getUnityWebappsProxies() {
+            return UnityWebAppsUtils.makeProxiesForWebViewBindee(webviewComponentLoader.item);
+        }
+
+        /*!
+          \internal
+         */
+        Loader {
+            id: webappBindingsLoader
+            visible: false
+            anchors.fill: parent
+        }
+
+        function userScriptInjected() {
+            webviewComponentLoader.item.url =
+                mainPage._getAppStartupIndexFileUri();
+        }
+
         /*!
           \internal
          */
         Component {
-            id: webviewFallbackComponent
-            UbuntuWebView {
-                url: mainPage._getAppStartupIndexFileUri()
-
-                experimental.preferences.localStorageEnabled: true
-                experimental.preferences.offlineWebApplicationCacheEnabled: true
-                experimental.preferences.universalAccessFromFileURLsAllowed: true
-                experimental.preferences.webGLEnabled: true
-
-                experimental.databaseQuotaDialog: Item {
-                    Timer {
-                        interval: 1
-                        running: true
-                        onTriggered: {
-                            model.accept(model.expectedUsage)
-                        }
-                    }
-                }
-                // port in QTWEBKIT_INSPECTOR_SERVER enviroment variable
-                experimental.preferences.developerExtrasEnabled: true
+            id: webappBindingsComponent
+
+            UnityWebApps {
+                bindee: mainPage
+                injectExtraUbuntuApis: true
+                requiresInit: false
+
+                onUserScriptsInjected: mainPage.userScriptInjected()
             }
         }
-
-        /*!
-          \internal
-         */
-        UbuntuJavascriptBindings {
-            id: bindings
-        }
     }
 }
-

=== added file 'src/plugin/Ubuntu/WebApps/WebViewOxide.qml'
--- src/plugin/Ubuntu/WebApps/WebViewOxide.qml	1970-01-01 00:00:00 +0000
+++ src/plugin/Ubuntu/WebApps/WebViewOxide.qml	2015-01-09 00:53:11 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of ubuntu-html5-ui-toolkit.
+ *
+ * ubuntu-html5-ui-toolkit 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.
+ *
+ * ubuntu-html5-ui-toolkit 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.Web 0.2
+import com.canonical.Oxide 1.0 as Oxide
+
+WebView {
+    id: webview
+
+    property bool remoteInspectorEnabled: false
+
+    preferences.localStorageEnabled: true
+    preferences.allowUniversalAccessFromFileUrls: true
+    preferences.appCacheEnabled: true
+
+    function navigationRequestedDelegate(request) {
+        var url = request.url.toString()
+
+        if (url.indexOf("file://") !== 0) {
+            request.action = Oxide.NavigationRequest.ActionReject
+            Qt.openUrlExternally(url)
+            return
+        }
+    }
+}

=== added file 'src/plugin/Ubuntu/WebApps/WebViewWebkit.qml'
--- src/plugin/Ubuntu/WebApps/WebViewWebkit.qml	1970-01-01 00:00:00 +0000
+++ src/plugin/Ubuntu/WebApps/WebViewWebkit.qml	2015-01-09 00:53:11 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of ubuntu-html5-ui-toolkit.
+ *
+ * ubuntu-html5-ui-toolkit 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.
+ *
+ * ubuntu-html5-ui-toolkit 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.Components.Extras.Browser 0.1
+
+UbuntuWebView {
+   id: webview
+
+   onNewTabRequested: {
+       if (url.toString().indexOf("file://") !== 0) {
+           Qt.openUrlExternally(url.toString())
+           return
+       }
+   }
+
+   property bool remoteInspectorEnabled: false
+   property string remoteInspectorPort: ""
+   property string remoteInspectorHost: ""
+
+   experimental.preferences.localStorageEnabled: true
+   experimental.preferences.offlineWebApplicationCacheEnabled: true
+   experimental.preferences.universalAccessFromFileURLsAllowed: true
+   experimental.preferences.webGLEnabled: true
+
+   experimental.databaseQuotaDialog: Item {
+       Timer {
+           interval: 1
+           running: true
+           onTriggered: {
+               model.accept(model.expectedUsage)
+           }
+        }
+    }
+ 
+   // port in QTWEBKIT_INSPECTOR_SERVER enviroment variable
+    experimental.preferences.developerExtrasEnabled: true
+}
\ No newline at end of file

=== modified file 'src/ubuntu-html5-app-launcher/CMakeLists.txt'
--- src/ubuntu-html5-app-launcher/CMakeLists.txt	2014-02-06 22:51:33 +0000
+++ src/ubuntu-html5-app-launcher/CMakeLists.txt	2015-01-09 00:53:11 +0000
@@ -19,7 +19,9 @@
 add_executable(${HTML5_LAUNCHER}
     ${HTML5_LAUNCHER_SRC}
 )
-qt5_use_modules(${HTML5_LAUNCHER} Core Widgets Quick)
+qt5_use_modules(${HTML5_LAUNCHER} Core Gui Qml Quick Widgets)
+
+include_directories(${Qt5Quick_PRIVATE_INCLUDE_DIRS})
 
 
 # install qml files

=== modified file 'src/ubuntu-html5-app-launcher/main.cpp'
--- src/ubuntu-html5-app-launcher/main.cpp	2014-12-08 18:08:39 +0000
+++ src/ubuntu-html5-app-launcher/main.cpp	2015-01-09 00:53:11 +0000
@@ -28,6 +28,11 @@
 #include <QQmlEngine>
 #include <QQmlContext>
 #include <QQmlComponent>
+#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
+#include <QtQuick/private/qsgcontext_p.h>
+#else
+#include <QtGui/private/qopenglcontext_p.h>
+#endif
 
 
 namespace {
@@ -72,7 +77,7 @@
     qputenv("QML2_IMPORT_PATH", existingImportPath.toLatin1());
 }
 
-void setUpQmlImportPathIfNecessary(const QString & applicationLocalSearchPath)
+void setUpQmlImportPathIfNecessary()
 {
     QString importPath = Webapp::Config::getContainerImportPath();
     if ( !importPath.isEmpty())
@@ -80,30 +85,10 @@
         addPathToQmlImport(importPath);
     }
 
-    // Note: By default we add the local path to the import path
-    //  mostly to account for potential Cordova 3.0 qml plugin
-    //  not installed globally but embedded into apps. So the
-    //  one embedded should take precedence over the ones installed
-    //  system wide (2.8).
-    addPathToQmlImport(applicationLocalSearchPath);
-
     qDebug() << "Setting import path to: "
              << qgetenv("QML2_IMPORT_PATH").data();
 }
 
-QString pluginPathForCurrentArchitecture()
-{
-#if defined(__i386__)
-    return QLatin1String("/lib/i386-linux-gnu");
-#elif defined(__x86_64__)
-    return QLatin1String("/lib/x86_64-linux-gnu");
-#elif defined(__arm__)
-    return QLatin1String("/lib/arm-linux-gnueabihf");
-#else
-#error Unable to determine target architecture
-#endif
-}
-
 
 void usage()
 {
@@ -138,10 +123,16 @@
     const QString ARG_HEADER = "--";
     const QString VALUE_HEADER = "=";
     const QString INSPECTOR = "--inspector";
+    const QString OXIDE = "--oxide";
 
     QString wwwfolderArg;
     bool maximized = false;
 
+    QString remoteInspectorHost = "";
+    QString remoteInspectorPort = QString::number(REMOTE_INSPECTOR_PORT);
+    bool remoteInspectorEnabled = false;
+    bool useOxide = false;
+
     QStringList arguments = app.arguments();
     arguments.pop_front();
 
@@ -149,7 +140,12 @@
     {
         if (argument.contains(WWW_LOCATION_ARG_HEADER))
         {
-            wwwfolderArg = argument.right(argument.count() - WWW_LOCATION_ARG_HEADER.count());
+            wwwfolderArg = argument.split(WWW_LOCATION_ARG_HEADER)[1];
+        }
+        else
+        if (argument == OXIDE)
+        {
+            useOxide = true;
         }
         else
         if (argument.contains(MAXIMIZED_ARG_HEADER))
@@ -157,22 +153,18 @@
             maximized = true;
         }
         else
-        if (argument.contains(INSPECTOR))
+        if (argument.startsWith(INSPECTOR))
         {
-            QString host;
+            remoteInspectorEnabled = true;
             Q_FOREACH(QHostAddress address, QNetworkInterface::allAddresses()) {
                 if (!address.isLoopback() && (address.protocol() == QAbstractSocket::IPv4Protocol)) {
-                    host = address.toString();
+                    remoteInspectorHost = address.toString();
                     break;
                 }
             }
-            QString server;
-            if (host.isEmpty()) {
-                server = QString::number(REMOTE_INSPECTOR_PORT);
-            } else {
-                server = QString("%1:%2").arg(host, QString::number(REMOTE_INSPECTOR_PORT));
+            if (argument.startsWith(INSPECTOR + "=")) {
+                remoteInspectorPort = argument.split(INSPECTOR + "=")[1];
             }
-            qputenv("QTWEBKIT_INSPECTOR_SERVER", server.toUtf8());
         }
         else
         {
@@ -188,7 +180,6 @@
     }
 
     QFileInfo wwwFolder(wwwfolderArg);
-
     if (wwwFolder.isRelative())
     {
         wwwFolder.makeAbsolute();
@@ -211,13 +202,38 @@
         QString appPkgName = qgetenv("APP_ID").split('_').first();
         QCoreApplication::setApplicationName(appPkgName);
     }
-
-    QString plugin_path = wwwFolder.absoluteFilePath() + "/.." +
-        pluginPathForCurrentArchitecture();
-
-    setUpQmlImportPathIfNecessary(plugin_path);
+    setUpQmlImportPathIfNecessary();
+
+    // Enable compositing in oxide
+    if (useOxide)
+    {
+        QOpenGLContext* glcontext = new QOpenGLContext();
+        glcontext->create();
+#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
+        QSGContext::setSharedOpenGLContext(glcontext);
+#elif QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
+        QOpenGLContextPrivate::setGlobalShareContext(glcontext);
+#else
+        qt_gl_set_global_share_context(glcontext);
+#endif
+    }
 
     QQuickView view;
+    QQmlEngine* engine = view.engine();
+    engine->rootContext()->setContextProperty("withOxide", useOxide);
+
+    if (remoteInspectorEnabled && useOxide) {
+        qputenv("UBUNTU_WEBVIEW_DEVTOOLS_HOST", remoteInspectorHost.toUtf8());
+        qputenv("UBUNTU_WEBVIEW_DEVTOOLS_PORT", remoteInspectorPort.toUtf8());
+    }
+
+    engine->rootContext()->setContextProperty("inspector", remoteInspectorEnabled);
+    engine->rootContext()->setContextProperty("wwwFolder", wwwFolder.absoluteFilePath());
+
+    if (remoteInspectorEnabled) {
+        qputenv("QTWEBKIT_INSPECTOR_SERVER", remoteInspectorPort.toUtf8());
+    }
+
     view.setSource(QUrl::fromLocalFile(Webapp::Config::getContainerMainQmlPath()
                                           + "/main.qml"));
     if (view.status() != QQuickView::Ready)
@@ -225,7 +241,6 @@
         qCritical() << "Main application component cannot be loaded.";
         return EXIT_FAILURE;
     }
-    view.rootObject()->setProperty("htmlIndexDirectory", wwwFolder.canonicalFilePath());
 
     view.setTitle(QCoreApplication::applicationName());
     view.setResizeMode(QQuickView::SizeRootObjectToView);
@@ -239,6 +254,3 @@
 
     return app.exec();
 }
-
-
-

=== modified file 'src/ubuntu-html5-app-launcher/main.qml'
--- src/ubuntu-html5-app-launcher/main.qml	2014-12-08 18:08:39 +0000
+++ src/ubuntu-html5-app-launcher/main.qml	2015-01-09 00:53:11 +0000
@@ -23,5 +23,8 @@
 WebAppContainer {
     width: units.gu(100)
     height: units.gu(75)
+
+    oxide: withOxide
+    remoteInspectorEnabled: inspector
+    htmlIndexDirectory: wwwFolder
 }
-

=== modified file 'tests/autopilot/tools/qml/webview.qml'
--- tests/autopilot/tools/qml/webview.qml	2014-12-08 18:08:39 +0000
+++ tests/autopilot/tools/qml/webview.qml	2015-01-09 00:53:11 +0000
@@ -17,8 +17,8 @@
  */
 
 import QtQuick 2.0
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
+import QtTest 1.0
+import com.canonical.Oxide 1.0 as Oxide
 
 Item {
     id: root
@@ -31,6 +31,8 @@
 
     signal resultUpdated(string message)
 
+    TestResult { id: qtest_testResult }
+
     function __gentid() {
         return Math.random() + '';
     }
@@ -64,23 +66,21 @@
         var tid = __gentid();
         var statement = 'document.getElementById("' + id + '").click();';
 
-        webview.experimental.evaluateJavaScript(__wrapJsCommands(statement),
-		function(result) { root.resultUpdated(root.__createResult(result)); });
+        var result = webview.evaluateCode(statement, true);
+        root.resultUpdated(root.__createResult(result, tid));
     }
 
     function evalInPageUnsafe(expr) {
-        var tid = __gentid();
-
-        webview.experimental.evaluateJavaScript(__wrapJsCommands(expr),
-		function(result) { root.resultUpdated(root.__createResult(result)); });
+        var result = webview.evaluateCode(expr, true);
+        root.resultUpdated(result.toString())
     }
 
     function clickAnyElementBySelector(selector) {
         var tid = __gentid();
         var statement = 'document.querySelectorAll("' + selector + '")[0].click();';
 
-        webview.experimental.evaluateJavaScript(__wrapJsCommands(statement),
-		function(result) { root.resultUpdated(root.__createResult(result)); });
+        var result = webview.evaluateCode(statement, true);
+        root.resultUpdated(root.__createResult(result, tid));
     }
 
     function elementWithIdHasAttribute(id,attribute,value) {
@@ -95,13 +95,13 @@
         statement += hasAttributeWithIdFunc;
         statement += "; return __hasAttributeWithId(id,attribute,value); "
 
-        webview.experimental.evaluateJavaScript(__wrapJsCommands(statement),
-		function(result) { root.resultUpdated(root.__createResult(result, tid)); });
+        var result = webview.evaluateCode(statement, true);
+        root.resultUpdated(root.__createResult(result, tid));
     }
 
     function isNodeWithIdVisible(id) {
         var tid = __gentid();
-	var isNodeWithIdVisibleFunc = '
+        var isNodeWithIdVisibleFunc = '
         function __isNodeWithIdVisible() {
             try { return document.getElementById(id).style.display !== "none"; } catch (e) { return e.toString(); };
             return false;
@@ -110,14 +110,15 @@
         var statement = __setupClosedVariables({'id': id});
         statement += isNodeWithIdVisibleFunc;
         statement += "; return __isNodeWithIdVisible(id); "
-        webview.experimental.evaluateJavaScript(__wrapJsCommands(statement),
-		function(result) { root.resultUpdated(root.__createResult(result, tid)); });
+
+        var result = webview.evaluateCode(statement, true);
+        root.resultUpdated(root.__createResult(result, tid));
     }
 
     function getAttributeForElementWithId(id,attribute) {
         var tid = __gentid();
         var getAttributeWithIdFunc = '
-	function __getAttributeWithId() {
+        function __getAttributeWithId() {
             try { var value = document.querySelector("#" + id).getAttribute(attribute); return value || ""; } catch (e) { return e.toString(); };
             return "";
         };';
@@ -126,11 +127,11 @@
         statement += getAttributeWithIdFunc;
         statement += "; return __getAttributeWithId(); "
 
-        webview.experimental.evaluateJavaScript(__wrapJsCommands(statement),
-		function(result) { root.resultUpdated(root.__createResult(result, tid)); });
+        var result = webview.evaluateCode(statement, true);
+        root.resultUpdated(root.__createResult(result, tid));
     }
 
-    WebView {
+    Oxide.WebView {
         objectName: "webview"
         id: webview
 
@@ -146,12 +147,77 @@
             left: parent.left
         }
 
-        experimental.userScripts: []
-        experimental.preferences.navigatorQtObjectEnabled: true
-        experimental.preferences.developerExtrasEnabled: true
-
-        experimental.userAgent: {
-            return "Mozilla/5.0 (iPad; CPU OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"
+        preferences.localStorageEnabled: true
+        preferences.appCacheEnabled: true
+
+        function evaluateCode(code, wrap) {
+          var value = webview._waitForResult(
+              webview.rootFrame.sendMessage(
+                "oxide://main-world",
+                "EVALUATE-CODE",
+                { code: code,
+                  wrap: wrap === undefined ? false : wrap }));
+            return value ? value.result : undefined;
+        }
+
+        function _waitForResult(req, timeout) {
+          var result;
+          var error;
+          req.onreply = function(response) {
+              result = response;
+              error = 0;
+          };
+          req.onerror = function(error_code, msg) {
+              result = msg;
+              error = error_code;
+          };
+          webview._waitFor(function() { return error !== undefined; },
+                                timeout);
+
+          if (error > 0) {
+              console.error('Error:' + error + ', result:' + result)
+          } else if (error === 0) {
+              return result;
+          } else {
+              throw new Error("Message call timed out");
+          }
+        }
+
+        function _waitFor(predicate, timeout) {
+          timeout = timeout || 5000000;
+          var end = Date.now() + timeout;
+          var i = Date.now();
+          while (i < end && !predicate()) {
+              qtest_testResult.wait(50);
+              i = Date.now();
+          }
+          return predicate();
+        }
+
+        context: Oxide.WebContext {
+            userScripts: [
+                Oxide.UserScript {
+                    context: "oxide://main-world"
+                    emulateGreasemonkey: true
+                    url: Qt.resolvedUrl("message-server.js")
+                    matchAllFrames: true
+                }
+            ]
+        }
+
+        onJavaScriptConsoleMessage: {
+            var msg = "[JS] (%1:%2) %3".arg(sourceId).arg(lineNumber).arg(message)
+            if (level === Oxide.WebView.LogSeverityVerbose) {
+                console.log(msg)
+            } else if (level === Oxide.WebView.LogSeverityInfo) {
+                console.info(msg)
+            } else if (level === Oxide.WebView.LogSeverityWarning) {
+                console.warn(msg)
+            } else if ((level === Oxide.WebView.LogSeverityError) ||
+                       (level === Oxide.WebView.LogSeverityErrorReport) ||
+                       (level === Oxide.WebView.LogSeverityFatal)) {
+                console.error(msg)
+            }
         }
     }
 

=== modified file 'tests/autopilot/ubuntu_html5_container/__init__.py'
--- tests/autopilot/ubuntu_html5_container/__init__.py	2014-12-08 18:08:39 +0000
+++ tests/autopilot/ubuntu_html5_container/__init__.py	2015-01-09 00:53:11 +0000
@@ -2,9 +2,7 @@
 # Copyright 2014 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 """Tests for the Ubuntu HTML5 Launcher package """
-
-

=== removed directory 'tests/autopilot/ubuntu_html5_container/emulators'
=== removed file 'tests/autopilot/ubuntu_html5_container/emulators/__init__.py'
--- tests/autopilot/ubuntu_html5_container/emulators/__init__.py	2014-12-08 18:08:39 +0000
+++ tests/autopilot/ubuntu_html5_container/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2014 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
-
-"""Tests for the Ubuntu HTML5 Launcher package """
-
-

=== modified file 'tests/autopilot/ubuntu_html5_container/tests/__init__.py'
--- tests/autopilot/ubuntu_html5_container/tests/__init__.py	2014-12-08 18:08:39 +0000
+++ tests/autopilot/ubuntu_html5_container/tests/__init__.py	2015-01-09 00:53:11 +0000
@@ -2,18 +2,22 @@
 # Copyright 2014 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 """Tests for the Ubuntu HTML5 Launcher package """
 
 import os
 from autopilot.testcase import AutopilotTestCase
 
+
 LAUNCHER_EXEC_NAME = 'ubuntu-html5-app-launcher'
 
-LOCAL_LAUNCHER_PATH = os.path.abspath("%s/%s" % (os.path.dirname(os.path.realpath(__file__))
-                                        , '../../../../src/ubuntu-html5-app-launcher/' + LAUNCHER_EXEC_NAME))
+LOCAL_LAUNCHER_PATH = os.path.abspath(
+    "{}/{}".format(
+        os.path.dirname(os.path.realpath(__file__)),
+        '../../../../src/ubuntu-html5-app-launcher/' + LAUNCHER_EXEC_NAME))
+
 INSTALLED_LAUNCHER_PATH = '/usr/bin/' + LAUNCHER_EXEC_NAME
 
 
@@ -35,7 +39,8 @@
 
     def launch_with_argument(self, args):
         try:
-            self.app = self.launch_test_application(self.get_launcher_path(), args)
-        except Exception, e:
+            self.app = self.launch_test_application(
+                self.get_launcher_path(),
+                args)
+        except Exception:
             pass
-

=== modified file 'tests/autopilot/ubuntu_html5_container/tests/test_appLaunch.py'
--- tests/autopilot/ubuntu_html5_container/tests/test_appLaunch.py	2014-12-08 18:08:39 +0000
+++ tests/autopilot/ubuntu_html5_container/tests/test_appLaunch.py	2015-01-09 00:53:11 +0000
@@ -2,12 +2,12 @@
 # Copyright 2014 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 from __future__ import absolute_import
 
-from testtools.matchers import Equals
+from testtools.matchers import NotEquals
 
 from ubuntu_html5_container.tests import UbuntuHtml5LauncherTestCase
 
@@ -16,7 +16,6 @@
     def setUp(self):
         super(UbuntuHtml5LauncherAppLaunchTestCase, self).setUp()
 
-    def test_launcherFailsWithNoWWW(self):
+    def test_launcher_succeeds_with_no_www(self):
         self.launch_with_argument('')
-        self.assertThat(self.get_app(), Equals(None))
-
+        self.assertThat(self.get_app(), NotEquals(None))

=== modified file 'tests/autopilot/ubuntu_html5_ui_toolkit/__init__.py'
--- tests/autopilot/ubuntu_html5_ui_toolkit/__init__.py	2014-12-08 18:08:39 +0000
+++ tests/autopilot/ubuntu_html5_ui_toolkit/__init__.py	2015-01-09 00:53:11 +0000
@@ -2,8 +2,7 @@
 # Copyright 2013 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 """Tests for the Ubuntu HTML5 UI SDK package """
-

=== removed directory 'tests/autopilot/ubuntu_html5_ui_toolkit/emulators'
=== removed file 'tests/autopilot/ubuntu_html5_ui_toolkit/emulators/__init__.py'
--- tests/autopilot/ubuntu_html5_ui_toolkit/emulators/__init__.py	2014-12-08 18:08:39 +0000
+++ tests/autopilot/ubuntu_html5_ui_toolkit/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
-
-"""Tests for the Ubuntu HTML5 UI SDK package """
-
-

=== modified file 'tests/autopilot/ubuntu_html5_ui_toolkit/tests/__init__.py'
--- tests/autopilot/ubuntu_html5_ui_toolkit/tests/__init__.py	2014-12-08 18:08:39 +0000
+++ tests/autopilot/ubuntu_html5_ui_toolkit/tests/__init__.py	2015-01-09 00:53:11 +0000
@@ -2,20 +2,20 @@
 # Copyright 2013 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 """Tests for the Ubuntu HTML5 package """
 
 import os
 import json
-import BaseHTTPServer
+import http.server as http
 import threading
 import subprocess
 
 HTTP_SERVER_PORT = 8383
 
-from testtools.matchers import Contains, Equals, GreaterThan
+from testtools.matchers import Equals, GreaterThan
 from autopilot.matchers import Eventually
 from autopilot.testcase import AutopilotTestCase
 from autopilot.input import Mouse, Touch, Pointer
@@ -25,14 +25,17 @@
 # from autopilot.introspection.qt import QtIntrospectionTestMixin
 
 
-class RequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
-    BASE_PATH_FOR_SERVED_APPS = {'rss-reader': "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../../../0.1/examples/apps/rss-reader')}
+class RequestHandler(http.BaseHTTPRequestHandler):
+    BASE_PATH_FOR_SERVED_APPS = {'rss-reader': "{}/{}".format(
+        os.path.dirname(os.path.realpath(__file__)),
+        '../../../../0.1/examples/apps/rss-reader')}
 
     def get_served_filename(self, appname, filename):
         if len(filename) == 0 or filename == '/':
             filename = 'autopilot.html'
-        print os.path.join(self.BASE_PATH_FOR_SERVED_APPS[appname], filename)
-        return os.path.join(self.BASE_PATH_FOR_SERVED_APPS[appname], filename)
+        return os.path.join(
+            self.BASE_PATH_FOR_SERVED_APPS[appname],
+            filename)
 
     def serve_file(self, filename):
         import mimetypes
@@ -51,7 +54,10 @@
         if self.path.startswith('/rss-reader'):
             filename = self.path[len('/rss-reader'):]
             self.send_response(200)
-            self.serve_file(self.get_served_filename('rss-reader', filename))
+            self.serve_file(
+                self.get_served_filename(
+                    'rss-reader',
+                    filename))
         else:
             self.send_error(404)
 
@@ -59,7 +65,9 @@
 class UbuntuHTML5HTTPServer(threading.Thread):
     def __init__(self, port):
         super(UbuntuHTML5HTTPServer, self).__init__()
-        self.server = BaseHTTPServer.HTTPServer(("", port), RequestHandler)
+        self.server = http.BaseHTTPServer.HTTPServer(
+            ("", port),
+            RequestHandler)
         self.server.allow_reuse_address = True
 
     def run(self):
@@ -71,15 +79,22 @@
 
 
 class UbuntuHTML5TestCaseBase(AutopilotTestCase):
-    BROWSER_CONTAINER_PATH = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../tools/qml/webview.qml')
-    INSTALLED_BROWSER_CONTAINER_PATH = '/usr/share/ubuntu-html5-ui-toolkit/tests/tools/qml/webview.qml'
-    arch = subprocess.check_output(
-        ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip()
-    BROWSER_QML_APP_LAUNCHER = "/usr/lib/" + arch + "/qt5/bin/qmlscene"
+    BROWSER_CONTAINER_PATH = "{}/{}".format(
+        os.path.dirname(os.path.realpath(__file__)),
+        '../../tools/qml/webview.qml')
+    INSTALLED_BROWSER_CONTAINER_PATH = \
+        '/usr/share/ubuntu-html5-ui-toolkit/tests/tools/qml/webview.qml'
+    BROWSER_QML_APP_LAUNCHER = "/usr/lib/{}/qt5/bin/qmlscene".format(
+        subprocess.check_output(
+            ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip().decode('utf-8'))
 
     # TODO: fix version
-    LOCAL_HTML_EXAMPLES_PATH = os.path.abspath("%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../../../tests'))
-    INSTALLED_HTML_EXAMPLES_PATH = '/usr/share/ubuntu-html5-ui-toolkit/tests/'
+    LOCAL_HTML_EXAMPLES_PATH = os.path.abspath(
+        "{}/{}".format(
+            os.path.dirname(os.path.realpath(__file__)),
+            '../../../../tests'))
+    INSTALLED_HTML_EXAMPLES_PATH = \
+        '/usr/share/ubuntu-html5-ui-toolkit/tests/'
 
     APPS_SUBFOLDER_NAME = 'apps'
 
@@ -106,16 +121,20 @@
         else:
             self.pointer = Pointer(Touch.create())
 
-        params = [self.BROWSER_QML_APP_LAUNCHER, self.get_browser_container_path()]
-        if (platform.model() <> 'Desktop'):
-            params.append('--desktop_file_hint=/usr/share/applications/unitywebappsqmllauncher.desktop')
+        params = [self.BROWSER_QML_APP_LAUNCHER,
+                  self.get_browser_container_path()]
+        if (platform.model() != 'Desktop'):
+            params.append(
+                '--desktop_file_hint=/usr/share/" \
+                + "applications/unitywebappsqmllauncher.desktop')
 
         self.app = self.launch_test_application(
             *params,
             app_type='qt')
 
         self.webviewContainer = self.get_webviewContainer()
-        self.watcher = self.webviewContainer.watch_signal('resultUpdated(QString)')
+        self.watcher = self.webviewContainer.watch_signal(
+            'resultUpdated(QString)')
         super(UbuntuHTML5TestCaseBase, self).setUp()
 
     def tearDown(self):
@@ -143,40 +162,60 @@
 
     def assert_url_eventually_loaded(self, url):
         webview = self.get_webview()
-        self.assertThat(webview.loadProgress, Eventually(Equals(100)))
-        self.assertThat(webview.loading, Eventually(Equals(False)))
-        self.assertThat(webview.url, Eventually(Equals(url)))
+        self.assertThat(
+            webview.loadProgress,
+            Eventually(Equals(100)))
+        self.assertThat(
+            webview.loading,
+            Eventually(Equals(False)))
+        self.assertThat(
+            webview.url,
+            Eventually(Equals(url)))
 
     def click_dom_node_with_id(self, id):
         webview = self.get_webviewContainer()
         webview.slots.clickElementById(id)
-        self.assertThat(lambda: self.watcher.num_emissions, Eventually(Equals(1)))
+        self.assertThat(
+            lambda: self.watcher.num_emissions,
+            Eventually(Equals(1)))
 
     def click_any_dom_node_by_selector(self, selector):
         webview = self.get_webviewContainer()
         webview.slots.clickAnyElementBySelector(selector)
-        self.assertThat(lambda: self.watcher.num_emissions, Eventually(Equals(1)))
+        self.assertThat(
+            lambda: self.watcher.num_emissions,
+            Eventually(Equals(1)))
 
     def is_dom_node_visible(self, id):
         webview = self.get_webviewContainer()
         prev_emissions = self.watcher.num_emissions
         webview.slots.isNodeWithIdVisible(id)
-        self.assertThat(lambda: self.watcher.num_emissions, Eventually(GreaterThan(prev_emissions)))
-        return json.loads(webview.get_signal_emissions('resultUpdated(QString)')[-1][0])['result']
+        self.assertThat(
+            lambda: self.watcher.num_emissions,
+            Eventually(GreaterThan(prev_emissions)))
+        return json.loads(
+            webview.get_signal_emissions(
+                'resultUpdated(QString)')[-1][0])['result']
 
     def eval_expression_in_page_unsafe(self, expr):
         webview = self.get_webviewContainer()
         prev_emissions = self.watcher.num_emissions
-        webview.slots.evalInPageUnsafe(expr)
-        self.assertThat(lambda: self.watcher.num_emissions, Eventually(GreaterThan(prev_emissions)))
-        return json.loads(webview.get_signal_emissions('resultUpdated(QString)')[-1][0])['result']
+        result = webview.slots.evalInPageUnsafe(expr)
+        self.assertThat(
+            lambda: self.watcher.num_emissions,
+            Eventually(GreaterThan(prev_emissions)))
+        return webview.get_signal_emissions('resultUpdated(QString)')[-1][0]
 
     def get_dom_node_id_attribute(self, id, attribute):
         webview = self.get_webviewContainer()
         prev_emissions = self.watcher.num_emissions
         webview.slots.getAttributeForElementWithId(id, attribute)
-        self.assertThat(lambda: self.watcher.num_emissions, Eventually(GreaterThan(prev_emissions)))
-        return json.loads(webview.get_signal_emissions('resultUpdated(QString)')[-1][0])['result']
+        self.assertThat(
+            lambda: self.watcher.num_emissions,
+            Eventually(GreaterThan(prev_emissions)))
+        return json.loads(
+            webview.get_signal_emissions(
+                'resultUpdated(QString)')[-1][0])['result']
 
     def get_address_bar_action_button(self):
         addressbar = self.get_addressbar()
@@ -185,23 +224,29 @@
     def browse_to_url(self, url):
         import time
         addressbar = self.get_addressbar()
-        self.assertThat(addressbar.activeFocus, Eventually(Equals(True)))
+        self.assertThat(
+            addressbar.activeFocus,
+            Eventually(Equals(True)))
 
         self.keyboard.type(url, 0.001)
 
         self.pointer.click_object(self.get_webview())
+
+        # XXX: very bad, but wont fix
         time.sleep(1)
 
-        button = self.get_address_bar_action_button();
+        button = self.get_address_bar_action_button()
         self.pointer.move_to_object(button)
         self.pointer.press()
+        # XXX: very bad, but wont fix
         time.sleep(1)
         self.pointer.release()
 
-        self.assert_url_eventually_loaded(url);
+        self.assert_url_eventually_loaded(url)
 
     def browse_to_app(self, appname):
-        appfilepath = os.path.abspath(self.BASE_PATH +
+        appfilepath = os.path.abspath(
+            self.BASE_PATH +
             '/data/html/' +
             self.APPS_SUBFOLDER_NAME +
             '/' +
@@ -213,7 +258,12 @@
         self.browse_to_url(APP_HTML_PATH)
 
     def browse_to_test_html(self, html_filename):
-        self.browse_to_url(self.create_file_url_from(os.path.abspath(self.BASE_PATH + '/data/html/' + html_filename)))
+        self.browse_to_url(
+            self.create_file_url_from(
+                os.path.abspath(
+                    '{}/data/html/{}'.format(
+                        self.BASE_PATH,
+                        html_filename))))
 
 
 class UbuntuThemeWithHttpServerTestCaseBase(UbuntuHTML5TestCaseBase):

=== modified file 'tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_pagestack.py'
--- tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_pagestack.py	2014-12-08 18:08:39 +0000
+++ tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_pagestack.py	2015-01-09 00:53:11 +0000
@@ -2,17 +2,16 @@
 # Copyright 2013 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 from __future__ import absolute_import
 
-import time
-
-from testtools.matchers import Contains, Equals
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
-from ubuntu_html5_ui_toolkit.tests import UbuntuHTML5TestCaseBase, UbuntuThemeRemotePageTestCaseBase
+from ubuntu_html5_ui_toolkit.tests import UbuntuHTML5TestCaseBase
+
 
 class UbuntuThemePageStackTestCase(UbuntuHTML5TestCaseBase):
 
@@ -21,25 +20,54 @@
 
     def test_pageLoadsWithNoPageStacks(self):
         self.browse_to_test_html('test-nopagestack-in-app.html')
-        self.assertThat(self.eval_expression_in_page_unsafe('var UI = new UbuntuUI(); UI.init(); return "ok";'), Equals('ok'));
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(
+                'var UI = new UbuntuUI(); UI.init(); return "ok";'),
+            Equals('ok'))
 
     def test_pageLoadsWithPageStacks(self):
         self.browse_to_test_html('test-pagestack-in-app.html')
-        self.assertThat(self.eval_expression_in_page_unsafe('var UI = new UbuntuUI(); UI.init(); return "ok";'), Equals('ok'));
-        self.assertThat(self.is_dom_node_visible('main'), Equals(True))
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(
+                'var UI = new UbuntuUI(); UI.init(); return "ok";'),
+            Equals('ok'))
+        self.assertThat(
+            self.is_dom_node_visible('main'),
+            Equals(True))
 
     def test_pageChangeWithPageStackPush(self):
         self.browse_to_test_html('test-pagestack-in-app.html')
-        self.assertThat(self.eval_expression_in_page_unsafe('var UI = new UbuntuUI(); UI.init(); UI.pagestack.push("results"); return "ok";'), Equals('ok'));
-        self.assertThat(self.is_dom_node_visible('main'), Equals(False))
-        self.assertThat(self.is_dom_node_visible('results'), Equals(True))
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(
+                'var UI = new UbuntuUI(); UI.init(); '
+                'UI.pagestack.push("results"); return "ok";'),
+            Equals('ok'))
+        self.assertThat(
+            self.is_dom_node_visible('main'),
+            Equals(False))
+        self.assertThat(
+            self.is_dom_node_visible('results'),
+            Equals(True))
 
     def test_pageChangeWithPageStackPopped(self):
         self.browse_to_test_html('test-pagestack-in-app.html')
-        self.assertThat(self.eval_expression_in_page_unsafe('var UI = new UbuntuUI(); UI.init(); UI.pagestack.push("main"); UI.pagestack.push("results"); UI.pagestack.push("article"); UI.pagestack.pop(); return "ok";'), Equals('ok'));
-        self.assertThat(self.is_dom_node_visible('main'), Equals(False))
-        self.assertThat(self.is_dom_node_visible('results'), Equals(True))
-        self.assertThat(self.is_dom_node_visible('article'), Equals(False))
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(
+                'var UI = new UbuntuUI(); UI.init(); '
+                'UI.pagestack.push("main"); '
+                'UI.pagestack.push("results"); '
+                'UI.pagestack.push("article"); '
+                'UI.pagestack.pop(); return "ok";'),
+            Equals('ok'))
+        self.assertThat(
+            self.is_dom_node_visible('main'),
+            Equals(False))
+        self.assertThat(
+            self.is_dom_node_visible('results'),
+            Equals(True))
+        self.assertThat(
+            self.is_dom_node_visible('article'),
+            Equals(False))
 
     def test_pagePushWithProperties(self):
         self.browse_to_test_html('test-pagestack-in-app.html')
@@ -50,14 +78,22 @@
 
         (new Page('results')).onactivated(
           function(properties) {
-            document.getElementById('results').innerHTML = JSON.stringify(properties);
+            document.getElementById('results').innerHTML =
+                JSON.stringify(properties);
           });
 
         ui.pagestack.push('results', 'WORKS');
         return 'ok';
         """
-        self.assertThat(self.eval_expression_in_page_unsafe(expression), Equals('ok'));
-        self.assertThat(lambda: self.is_dom_node_visible('results'), Eventually(Equals(True)))
-        results_html_content = "return document.getElementById('results').innerHTML;"
-        self.assertThat(self.eval_expression_in_page_unsafe(results_html_content), Equals('"WORKS"'));
-
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(expression),
+            Equals('ok'))
+        self.assertThat(
+            lambda: self.is_dom_node_visible('results'),
+            Eventually(Equals(True)))
+        results_html_content = \
+            "return document.getElementById('results').innerHTML;"
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(
+                results_html_content),
+            Equals('"WORKS"'))

=== modified file 'tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_rss_reader.py'
--- tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_rss_reader.py	2014-12-08 18:08:39 +0000
+++ tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_rss_reader.py	2015-01-09 00:53:11 +0000
@@ -2,17 +2,16 @@
 # Copyright 2013 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 from __future__ import absolute_import
 
-import time
-
 from testtools.matchers import Contains, Equals
 from autopilot.matchers import Eventually
 
-from ubuntu_html5_ui_toolkit.tests import UbuntuHTML5TestCaseBase, UbuntuThemeRemotePageTestCaseBase
+from ubuntu_html5_ui_toolkit.tests import UbuntuHTML5TestCaseBase
+
 
 class UbuntuThemeRSSReaderTestCase(UbuntuHTML5TestCaseBase):
     def setUp(self):
@@ -29,6 +28,8 @@
 
     def test_switchToFeedView(self):
         self.click_any_dom_node_by_selector('#yourfeeds li a')
-        self.assertThat(lambda: self.is_dom_node_visible('main'), Eventually(Equals(False)))
+        self.assertThat(
+            lambda: self.is_dom_node_visible('main'),
+            Eventually(Equals(False)))
         self.assertThat(self.is_dom_node_visible('article'), Equals(False))
         self.assertThat(self.is_dom_node_visible('results'), Equals(True))

=== modified file 'tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_tabs.py'
--- tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_tabs.py	2014-12-08 18:08:39 +0000
+++ tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_tabs.py	2015-01-09 00:53:11 +0000
@@ -2,18 +2,17 @@
 # Copyright 2014 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 3, as published
-# by the Free Software Foundation.
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
 
 from __future__ import absolute_import
 
-import time
-
-from testtools.matchers import Contains, Equals
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
 from ubuntu_html5_ui_toolkit.tests import UbuntuHTML5TestCaseBase
 
+
 class UbuntuUIToolkitTabsTestCase(UbuntuHTML5TestCaseBase):
 
     def setUp(self):
@@ -21,11 +20,27 @@
 
     def test_programaticTabSelectIndex(self):
         self.browse_to_test_html('test-tabs-in-app.html')
-        self.assertThat(self.eval_expression_in_page_unsafe('var UI = new UbuntuUI(); UI.init(); UI.tabs.selectedTabIndex = 1; return "ok";'), Equals('ok'));
-
-        self.assertThat(lambda: self.is_dom_node_visible('tab1'), Eventually(Equals(False)))
-        self.assertThat(lambda: self.is_dom_node_visible('tab2'), Eventually(Equals(True)))
-        self.assertThat(lambda: self.is_dom_node_visible('tab3'), Eventually(Equals(False)))
-
-        self.assertThat(self.eval_expression_in_page_unsafe('var UI = new UbuntuUI(); UI.init(); return UI.tabs.selectedTabIndex = 1;'), Equals(1));
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(
+                'var UI = new UbuntuUI(); '
+                'UI.init(); UI.tabs.selectedTabIndex = 1; '
+                'return "ok";'),
+            Equals('ok'))
+
+        self.assertThat(
+            lambda: self.is_dom_node_visible('tab1'),
+            Eventually(Equals(False)))
+        self.assertThat(
+            lambda: self.is_dom_node_visible('tab2'),
+            Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.is_dom_node_visible('tab3'),
+            Eventually(Equals(False)))
+
+        self.assertThat(
+            self.eval_expression_in_page_unsafe(
+                'var UI = new UbuntuUI(); '
+                'UI.init(); '
+                'return UI.tabs.selectedTabIndex;'),
+            Equals('1'))