Merge lp:~jfmoy/ubuntu-html5-theme/webview-component into lp:ubuntu-html5-theme

[Jean-Francois Moy]

Moved to the new Ubuntu.Web component. Some properties pointing to experimental faeture of QtWebkit (WebGL, developer extra, etc.) had to be dropped as they are not present in Ubuntu.Web.

Switched from the Ubuntu.Components.Extras.Browser (that uses QtWebKit) to the Ubuntu.Web component (that uses Oxide). Some experimental features that were enabled with the former component are not available in Ubuntu.Web (such as WebGL).

After generating the binary, one can test with the provided examples projects.

[David Barth (dbarth)]

The devtools support should be present in Oxide and the new view however.

On Wed, Sep 17, 2014 at 1:55 PM, Jean-Francois Moy <
<email address hidden>> wrote:

> Jean-Francois Moy has proposed merging
> lp:~jfmoy/ubuntu-html5-theme/webview-component into lp:ubuntu-html5-theme.
>
> Commit message:
> Moved to the new Ubuntu.Web component. Some properties pointing to
> experimental faeture of QtWebkit (WebGL, developer extra, etc.) had to be
> dropped as they are not present in Ubuntu.Web.
>
> Requested reviews:
> Ubuntu HTML5 Theme Developers (ubuntu-html5-theme-devs)
>
> For more details, see:
>
> https://code.launchpad.net/~jfmoy/ubuntu-html5-theme/webview-component/+merge/234947
>
> Switched from the Ubuntu.Components.Extras.Browser (that uses QtWebKit) to
> the Ubuntu.Web component (that uses Oxide). Some experimental features that
> were enabled with the former component are not available in Ubuntu.Web
> (such as WebGL).
>
> After generating the binary, one can test with the provided examples
> projects.
> --
>
> https://code.launchpad.net/~jfmoy/ubuntu-html5-theme/webview-component/+merge/234947
> Your team Ubuntu HTML5 Theme Developers is requested to review the
> proposed merge of lp:~jfmoy/ubuntu-html5-theme/webview-component into
> lp:ubuntu-html5-theme.
>
> === modified file 'src/plugin/Ubuntu/WebApps/WebAppContainer.qml'
> --- src/plugin/Ubuntu/WebApps/WebAppContainer.qml 2014-03-29
> 15:04:02 +0000
> +++ src/plugin/Ubuntu/WebApps/WebAppContainer.qml 2014-09-17
> 11:54:21 +0000
> @@ -18,7 +18,7 @@
>
> import QtQuick 2.0
> import Ubuntu.Components 0.1
> -import Ubuntu.Components.Extras.Browser 0.1
> +import Ubuntu.Web 0.2
>
>
> /*!
> @@ -104,25 +104,11 @@
> */
> Component {
> id: webviewFallbackComponent
> - UbuntuWebView {
> + WebView {
> 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
> + preferences.localStorageEnabled: true
> + preferences.allowUniversalAccessFromFileUrls: true
> }
> }
>
>
>
>

[Jean-Francois Moy (jfmoy)]

There is no accessible property to enable that (I checked the oxide
source code:
http://bazaar.launchpad.net/~oxide-developers/oxide/oxide.trunk/view/head:/qt/core/api/oxideqwebpreferences.h);
it might be enabled by default.
On 17/09/14 18:12, David Barth wrote:
> The devtools support should be present in Oxide and the new view however.
>
> On Wed, Sep 17, 2014 at 1:55 PM, Jean-Francois Moy <
> <email address hidden>> wrote:
>
>> Jean-Francois Moy has proposed merging
>> lp:~jfmoy/ubuntu-html5-theme/webview-component into lp:ubuntu-html5-theme.
>>
>> Commit message:
>> Moved to the new Ubuntu.Web component. Some properties pointing to
>> experimental faeture of QtWebkit (WebGL, developer extra, etc.) had to be
>> dropped as they are not present in Ubuntu.Web.
>>
>> Requested reviews:
>> Ubuntu HTML5 Theme Developers (ubuntu-html5-theme-devs)
>>
>> For more details, see:
>>
>> https://code.launchpad.net/~jfmoy/ubuntu-html5-theme/webview-component/+merge/234947
>>
>> Switched from the Ubuntu.Components.Extras.Browser (that uses QtWebKit) to
>> the Ubuntu.Web component (that uses Oxide). Some experimental features that
>> were enabled with the former component are not available in Ubuntu.Web
>> (such as WebGL).
>>
>> After generating the binary, one can test with the provided examples
>> projects.
>> --
>>
>> https://code.launchpad.net/~jfmoy/ubuntu-html5-theme/webview-component/+merge/234947
>> Your team Ubuntu HTML5 Theme Developers is requested to review the
>> proposed merge of lp:~jfmoy/ubuntu-html5-theme/webview-component into
>> lp:ubuntu-html5-theme.
>>
>> === modified file 'src/plugin/Ubuntu/WebApps/WebAppContainer.qml'
>> --- src/plugin/Ubuntu/WebApps/WebAppContainer.qml 2014-03-29
>> 15:04:02 +0000
>> +++ src/plugin/Ubuntu/WebApps/WebAppContainer.qml 2014-09-17
>> 11:54:21 +0000
>> @@ -18,7 +18,7 @@
>>
>> import QtQuick 2.0
>> import Ubuntu.Components 0.1
>> -import Ubuntu.Components.Extras.Browser 0.1
>> +import Ubuntu.Web 0.2
>>
>>
>> /*!
>> @@ -104,25 +104,11 @@
>> */
>> Component {
>> id: webviewFallbackComponent
>> - UbuntuWebView {
>> + WebView {
>> 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
>> + preferences.localStorageEnabled: true
>> + preferences.allowUniversalAccessFromFileUrls: true
>> }
>> ...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:171
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/152/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3751
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-utopic-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4062
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4062/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/152/rebuild

review: Approve (continuous-integration)

[lp:~jfmoy/ubuntu-html5-theme/webview-component]

172. By Jean-Francois Moy on 2014-10-01

Added remote debugging capabilities to the WebView, if --inspector argument is provided. Added back the appCache in the webview.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:172
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/153/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3879
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-utopic-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-utopic-armhf-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3256
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4192
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4192/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/153/rebuild

review: Approve (continuous-integration)

[lp:~jfmoy/ubuntu-html5-theme/webview-component]

173. By Jean-Francois Moy on 2014-10-02

Make sure dev tools properties are available at initialisation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:173
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/154/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3891
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-utopic-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-utopic-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4208
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4208/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/154/rebuild

review: Approve (continuous-integration)

=== modified file 'src/plugin/Ubuntu/WebApps/CordovaLoader.qml'
--- src/plugin/Ubuntu/WebApps/CordovaLoader.qml	2014-02-10 16:15:29 +0000
+++ src/plugin/Ubuntu/WebApps/CordovaLoader.qml	2014-10-02 14:40:44 +0000
@@ -23,6 +23,11 @@
 
     property string htmlIndexDirectory
 
+    // Remote Inspector Properties
+    property string remoteInspectorEnabled
+    property string remoteInspectorPort
+    property string remoteInspectorHost
+
     // Cordova plugin instance
     property var cordovaInstance: null
 

=== modified file 'src/plugin/Ubuntu/WebApps/WebAppContainer.qml'
--- src/plugin/Ubuntu/WebApps/WebAppContainer.qml	2014-03-29 15:04:02 +0000
+++ src/plugin/Ubuntu/WebApps/WebAppContainer.qml	2014-10-02 14:40:44 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.Extras.Browser 0.1
+import Ubuntu.Web 0.2
 
 
 /*!
@@ -42,6 +42,22 @@
       */
     property alias htmlIndexDirectory: cordovaWebviewProvider.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 alias remoteInspectorEnabled: cordovaWebviewProvider.remoteInspectorEnabled
+    property alias remoteInspectorHost: cordovaWebviewProvider.remoteInspectorHost
+    property alias remoteInspectorPort: cordovaWebviewProvider.remoteInspectorPort
+
+    /*!
+      \preliminary
+      The property holds the whether .
+
+      The path is absolute or relative to the current dir.
+      */
+
     Page {
         id: mainPage
         anchors.fill: parent
@@ -104,25 +120,18 @@
          */
         Component {
             id: webviewFallbackComponent
-            UbuntuWebView {
+            WebView {
                 url: mainPage._getAppStartupIndexFileUri()
 
-                experimental.preferences.localStorageEnabled: true
-                experimental.preferences.offlineWebApplicationCacheEnabled: true
-                experimental.preferences.universalAccessFromFileURLsAllowed: true
-                experimental.preferences.webGLEnabled: true
+                preferences.localStorageEnabled: true
+                preferences.allowUniversalAccessFromFileUrls: true
+                preferences.appCacheEnabled: true
 
-                experimental.databaseQuotaDialog: Item {
-                    Timer {
-                        interval: 1
-                        running: true
-                        onTriggered: {
-                            model.accept(model.expectedUsage)
-                        }
-                    }
+                context: WebContext {
+                    devtoolsEnabled: root.remoteInspectorEnabled
+                    devtoolsIp: root.remoteInspectorHost
+                    devtoolsPort: root.remoteInspectorPort
                 }
-                // port in QTWEBKIT_INSPECTOR_SERVER enviroment variable
-                experimental.preferences.developerExtrasEnabled: true
             }
         }
 

=== modified file 'src/ubuntu-html5-app-launcher/main.cpp'
--- src/ubuntu-html5-app-launcher/main.cpp	2014-04-03 13:57:30 +0000
+++ src/ubuntu-html5-app-launcher/main.cpp	2014-10-02 14:40:44 +0000
@@ -142,6 +142,10 @@
     QString wwwfolderArg;
     bool maximized = false;
 
+    QString remoteInspectorHost = "";
+    QString remoteInspectorPort = QString::number(REMOTE_INSPECTOR_PORT);
+    bool remoteInspectorEnabled = false;
+
     QStringList arguments = app.arguments();
     arguments.pop_front();
 
@@ -159,20 +163,13 @@
         else
         if (argument.contains(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));
-            }
-            qputenv("QTWEBKIT_INSPECTOR_SERVER", server.toUtf8());
         }
         else
         {
@@ -225,8 +222,10 @@
         qCritical() << "Main application component cannot be loaded.";
         return EXIT_FAILURE;
     }
+    view.rootObject()->setProperty("remoteInspectorEnabled", remoteInspectorEnabled);
+    view.rootObject()->setProperty("remoteInspectorHost", remoteInspectorHost);
+    view.rootObject()->setProperty("remoteInspectorPort", remoteInspectorPort);
     view.rootObject()->setProperty("htmlIndexDirectory", wwwFolder.canonicalFilePath());
-
     view.setTitle(QCoreApplication::applicationName());
     view.setResizeMode(QQuickView::SizeRootObjectToView);