Merge lp:~abreu-alexandre/ubuntu-html5-theme/rtm-fix-webkit-launch into lp:ubuntu-html5-theme/rtm-14.09

[Alexandre Abreu]

Mitigate the QtWebkit / Mainview issue

QtWebkit w/ Qt 5.3 seems to have a race when bundled w/ certain qml elements, something like e.g.:

MainView {

  Page { WebView {} }
}

makes the app (launched as a click) on the devices (w/ RTM or Vivid) spin at startup w/o ever actually showing something,

It does that usually on the first launch, subsequent launches usually work fine. Things do work fine when the Webview is replaced by a Window or even an Item. After some strace and investigation it seems that some bits are racy in QtWebkit in relation w/ its ~/.local/share content.

In the behavior described above, the app goes back into failing mode when one deletes the apps' ~/.local/share. Some cookie DB creation errors (that are not seen consistently though) seem to backup the hypothesis above,

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-12-08 18:08:39 +0000
+++ CMakeLists.txt	2015-02-12 18:32:50 +0000
@@ -26,5 +26,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/ubuntu-html5-container.install'
--- debian/ubuntu-html5-container.install	2014-01-27 18:42:31 +0000
+++ debian/ubuntu-html5-container.install	2015-02-12 18:32:50 +0000
@@ -1,3 +1,2 @@
 usr/bin/ubuntu-html5-app-launcher
-usr/lib/*/qt5/qml/Ubuntu/WebApps/*
 usr/share/ubuntu-html5-app-launcher/

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-02-06 22:51:33 +0000
+++ src/CMakeLists.txt	2015-02-12 18:32:50 +0000
@@ -1,2 +1,2 @@
 add_subdirectory(ubuntu-html5-app-launcher)
-add_subdirectory(plugin)
+

=== removed directory 'src/plugin'
=== removed file 'src/plugin/CMakeLists.txt'
--- src/plugin/CMakeLists.txt	2013-11-27 16:33:23 +0000
+++ src/plugin/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-add_subdirectory(Ubuntu)

=== removed directory 'src/plugin/Ubuntu'
=== removed file 'src/plugin/Ubuntu/CMakeLists.txt'
--- src/plugin/Ubuntu/CMakeLists.txt	2013-11-27 16:33:23 +0000
+++ src/plugin/Ubuntu/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-add_subdirectory(WebApps)

=== removed directory 'src/plugin/Ubuntu/WebApps'
=== removed file 'src/plugin/Ubuntu/WebApps/CMakeLists.txt'
--- src/plugin/Ubuntu/WebApps/CMakeLists.txt	2013-12-10 16:16:11 +0000
+++ src/plugin/Ubuntu/WebApps/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-project(ubuntu-html5-container)
-
-# setup install location
-execute_process(
-    COMMAND qmake -query QT_INSTALL_QML
-    OUTPUT_VARIABLE QT_INSTALL_QML
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-set(HTML5_CONTAINER_IMPORTS_DIR "${QT_INSTALL_QML}/Ubuntu/WebApps")
-
-# setup install for local component files
-file(GLOB QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml qmldir)
-install(FILES ${QML_FILES} DESTINATION ${HTML5_CONTAINER_IMPORTS_DIR})
-
-# make sure that we have all the files in the right place if we test locally
-# & have a specific build dir
-if(NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-  foreach(_qmlfile ${QML_FILES})
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_qmlfile}
-                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_qmlfile}
-                       COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${_qmlfile} ${CMAKE_CURRENT_BINARY_DIR}/${_qmlfile})
-  endforeach(_qmlfile)
-  add_custom_target(copy_to_build_dir DEPENDS ${QML_FILES})
-endif()
-

=== 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
-        }
-    }
-}
-

=== removed 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	1970-01-01 00:00:00 +0000
@@ -1,137 +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.Components 0.1
-import Ubuntu.Components.Extras.Browser 0.1
-
-
-/*!
-    \qmltype WebAppContainer
-    \inqmlmodule Ubuntu.WebApps 0.1
-    \ingroup ubuntu
-    \brief WebAppContainer is the root element that should be used for all HTML5 applications.
-*/
-MainView {
-    id: root
-    objectName: "root"
-    anchorToKeyboard: true
-    automaticOrientation: 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
-
-    Page {
-        id: mainPage
-        anchors.fill: parent
-
-        /*!
-          \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';
-        }
-
-        /*!
-          \internal
-         */
-        Loader {
-            id: webviewFallbackComponentLoader
-            anchors.fill: parent
-            onLoaded: {
-                bindings.bindingMainWebview = item;
-            }
-        }
-
-        /*!
-          \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
-            }
-        }
-
-        /*!
-          \internal
-         */
-        UbuntuJavascriptBindings {
-            id: bindings
-        }
-    }
-}
-

=== removed file 'src/plugin/Ubuntu/WebApps/qmldir'
--- src/plugin/Ubuntu/WebApps/qmldir	2013-11-27 16:33:23 +0000
+++ src/plugin/Ubuntu/WebApps/qmldir	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-module Ubuntu.WebApps
-WebAppContainer 0.1 WebAppContainer.qml

=== 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-02-12 18:32:50 +0000
@@ -26,7 +26,6 @@
 file(GLOB QML_FILES *.qml)
 install(FILES ${QML_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/ubuntu-html5-app-launcher/qml)
 
-
 # install bin files
 install(TARGETS ${HTML5_LAUNCHER}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

=== added file 'src/ubuntu-html5-app-launcher/UbuntuJavascriptBindings.qml'
--- src/ubuntu-html5-app-launcher/UbuntuJavascriptBindings.qml	1970-01-01 00:00:00 +0000
+++ src/ubuntu-html5-app-launcher/UbuntuJavascriptBindings.qml	2015-02-12 18:32:50 +0000
@@ -0,0 +1,59 @@
+/*
+ * 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/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-02-12 18:32:50 +0000
@@ -217,7 +217,11 @@
 
     setUpQmlImportPathIfNecessary(plugin_path);
 
+
     QQuickView view;
+    view.rootContext()->setContextProperty(
+        "HtmlIndexDirectory", wwwFolder.canonicalFilePath());
+
     view.setSource(QUrl::fromLocalFile(Webapp::Config::getContainerMainQmlPath()
                                           + "/main.qml"));
     if (view.status() != QQuickView::Ready)
@@ -225,7 +229,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);

=== 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-02-12 18:32:50 +0000
@@ -17,11 +17,79 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.WebApps 0.1
-
-WebAppContainer {
+import Ubuntu.Components 1.0
+import Ubuntu.Components.Extras.Browser 0.1
+import QtWebKit.experimental 1.0
+
+MainView {
+    id: root
+
     width: units.gu(100)
     height: units.gu(75)
+
+    anchorToKeyboard: true
+    automaticOrientation: true
+
+    Timer {
+        id: checkTimer
+        running: true
+        repeat: false
+        onTriggered: {
+            webviewComponentLoader.sourceComponent =
+                    webviewComponent
+            checkTimer.stop()
+        }
+        interval: 100
+    }
+
+    Page {
+        anchors.fill: parent
+        Loader {
+            id: webviewComponentLoader
+            anchors.fill: parent
+            onLoaded: {
+                bindings.bindingMainWebview =
+                        webviewComponentLoader.item;
+            }
+        }
+    }
+
+    Component {
+        id: webviewComponent
+
+        UbuntuWebView {
+            maximumFlickVelocity: height * 5
+
+            url: HtmlIndexDirectory !== "" ? ('file://' + HtmlIndexDirectory + '/index.html') : ""
+
+            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
+
+            onNewTabRequested: {
+                if (url.toString().indexOf("file://") !== 0) {
+                    Qt.openUrlExternally(url.toString())
+                    return
+                }
+            }
+        }
+    }
+
+    UbuntuJavascriptBindings {
+        id: bindings
+    }
 }
-