Merge lp:~abreu-alexandre/webbrowser-app/host-support-devtools into lp:webbrowser-app

[Alexandre Abreu]

Properly setup host support when devtools inspector mode used

Properly setup host support when devtools inspector mode used.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:736
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1125/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3903
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/324
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/324/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/324
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6704
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6704/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14086
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4220
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4220/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:736
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1126/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5454
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3904
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/325
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/325/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6706
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6706/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14089
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4221
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4221/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Works nicely, thanks!

review: Approve

[lp:~abreu-alexandre/webbrowser-app/host-support-devtools]

739. By PS Jenkins bot on 2014-10-03

Resync trunk

740. By Alexandre Abreu on 2014-10-03

Add a simple mechanism (simpler than the one already in place) to override user agents for a given webapp. Fixes: 1370975
Approved by: PS Jenkins bot, Olivier Tilloy

741. By Olivier Tilloy on 2014-10-03

Ship a PNG icon instead of an SVG, and install it under the app’s own data dir. Fixes: 1365408
Approved by: Ken VanDine, PS Jenkins bot

742. By Olivier Tilloy on 2014-10-03

Make an autopilot test more robust by ensuring that the drawer menu is dismissed but not clicked. Fixes: 1365304
Approved by: PS Jenkins bot

743. By Olivier Tilloy on 2014-10-03

Persistently cache favicons on disk to avoid re-downloading them across application runs. Fixes: 1340585
Approved by: PS Jenkins bot

744. By Olivier Tilloy on 2014-10-03

Ensure that at most 2 webviews are instantiated at all times, to reduce memory consumption. Fixes: 1376418
Approved by: PS Jenkins bot

745. By Alberto Mardegan on 2014-10-03

Fix handling of host cookies

Oxide (and chromium) expect host cookies to be treated in a special way: the domain in the cookie must be left empty, or an initial "." will always be added to the cookie domain. Fixes: 1371659
Approved by: Olivier Tilloy

746. By PS Jenkins bot on 2014-10-03

Releasing 0.23+14.10.20141003-0ubuntu1

747. By Launchpad Translations on behalf of phablet-team on 2014-10-04

Launchpad automatic translations update.

[Olivier Tilloy (osomon)]

With the latest changes in trunk, this doesn’t merge cleanly any longer. Can you please fix this (trivial) conflict?

review: Needs Fixing

[lp:~abreu-alexandre/webbrowser-app/host-support-devtools]

748. By Launchpad Translations on behalf of phablet-team on 2014-10-05

Launchpad automatic translations update.

749. By Launchpad Translations on behalf of phablet-team on 2014-10-06

Launchpad automatic translations update.

750. By Alexandre Abreu on 2014-10-06

Add support for devtools host argument

[Alexandre Abreu (abreu-alexandre)]

updated

[Olivier Tilloy (osomon)]

Looks good, but I have one comment (see inline) to improve code readability.

[lp:~abreu-alexandre/webbrowser-app/host-support-devtools]

751. By Alexandre Abreu on 2014-10-06

update

[Alexandre Abreu (abreu-alexandre)]

updated

[Olivier Tilloy (osomon)]

Looks good now, thanks!

review: Approve

=== modified file 'src/Ubuntu/Web/UbuntuWebContext.qml'
--- src/Ubuntu/Web/UbuntuWebContext.qml	2014-08-11 15:13:50 +0000
+++ src/Ubuntu/Web/UbuntuWebContext.qml	2014-10-06 14:12:36 +0000
@@ -82,4 +82,5 @@
 
     devtoolsEnabled: webviewDevtoolsDebugPort !== -1
     devtoolsPort: webviewDevtoolsDebugPort
+    devtoolsIp: webviewDevtoolsDebugHost
 }

=== modified file 'src/Ubuntu/Web/plugin.cpp'
--- src/Ubuntu/Web/plugin.cpp	2014-09-26 13:30:46 +0000
+++ src/Ubuntu/Web/plugin.cpp	2014-10-06 14:12:36 +0000
@@ -83,6 +83,18 @@
     return port > 0 ? port : DEVTOOLS_INVALID_PORT;
 }
 
+
+static QString getDevtoolsHost()
+{
+    QString host;
+    const char* DEVTOOLS_HOST_ENV_VAR = "UBUNTU_WEBVIEW_DEVTOOLS_HOST";
+
+    if (qEnvironmentVariableIsSet(DEVTOOLS_HOST_ENV_VAR)) {
+        host = qgetenv(DEVTOOLS_HOST_ENV_VAR);
+    }
+    return host;
+}
+
 void UbuntuBrowserPlugin::initializeEngine(QQmlEngine* engine, const char* uri)
 {
     Q_UNUSED(uri);
@@ -102,6 +114,7 @@
 
     context->setContextProperty("formFactor", getFormFactor());
     context->setContextProperty("webviewDevtoolsDebugPort", getDevtoolsPort());
+    context->setContextProperty("webviewDevtoolsDebugHost", getDevtoolsHost());
 
     engine->addImageProvider("favicon", new FaviconImageProvider());
 }

=== modified file 'src/app/browserapplication.cpp'
--- src/app/browserapplication.cpp	2014-09-15 17:08:41 +0000
+++ src/app/browserapplication.cpp	2014-10-06 14:12:36 +0000
@@ -77,6 +77,18 @@
     return port;
 }
 
+QString BrowserApplication::inspectorHost() const
+{
+    QString host;
+    Q_FOREACH(QHostAddress address, QNetworkInterface::allAddresses()) {
+        if (!address.isLoopback() && (address.protocol() == QAbstractSocket::IPv4Protocol)) {
+            host = address.toString();
+            break;
+        }
+    }
+    return host;
+}
+
 QString BrowserApplication::appId() const
 {
     Q_FOREACH(const QString& argument, m_arguments) {
@@ -123,8 +135,10 @@
 #endif
 
     QString devtoolsPort = inspectorPort();
+    QString devtoolsHost = inspectorHost();
     bool inspectorEnabled = !devtoolsPort.isEmpty();
     if (inspectorEnabled) {
+        qputenv("UBUNTU_WEBVIEW_DEVTOOLS_HOST", devtoolsHost.toUtf8());
         qputenv("UBUNTU_WEBVIEW_DEVTOOLS_PORT", devtoolsPort.toUtf8());
     }
 

=== modified file 'src/app/browserapplication.h'
--- src/app/browserapplication.h	2014-07-03 19:49:54 +0000
+++ src/app/browserapplication.h	2014-10-06 14:12:36 +0000
@@ -59,6 +59,7 @@
 private:
     QString appId() const;
     QString inspectorPort() const;
+    QString inspectorHost() const;
 
     WebBrowserWindow *m_webbrowserWindowProxy;
 };