Merge lp:~osomon/webbrowser-app/dpr-in-plugin into lp:webbrowser-app

[Olivier Tilloy]

Expose the correct DPR on the UbuntuWebView component.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:378
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/471/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4820
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2672/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/355
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/354
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/354/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/354
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/998
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/695
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/695/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2674
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2674/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2213
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2226/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/webbrowser-app-ci/471/rebuild

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

mako device was stuck, re-building.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:378
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/472/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4825
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2678
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/356
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/355
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/355/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/355
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1003
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/700
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/700/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2680
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2680/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2219
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2232

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/webbrowser-app-ci/472/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:378
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/478/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4846
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2709
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/362
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/361
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/361/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/361
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1023
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/721
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/721/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2711
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2711/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2246
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2259

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/webbrowser-app-ci/478/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:378
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/482/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4881
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2751
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/366
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/365
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/365/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1059
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/756
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/756/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2753
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2753/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2289
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2304

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/webbrowser-app-ci/482/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

works, tested it using this qml file:
import QtQuick 2.0
import Ubuntu.Components.Extras.Browser 0.1

UbuntuWebView {
    width: 360
    height: 640
    url: "http://m.facebook.com"
}

Without this fix facebook comes up really small at wrong dpr. With this fix it comes up at the correct dpr.

review: Approve

=== modified file 'src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml'
--- src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml	2013-10-02 13:55:48 +0000
+++ src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml	2013-10-09 11:43:11 +0000
@@ -28,11 +28,13 @@
 
     signal newTabRequested(url url)
 
-    property real devicePixelRatio: 1.0
-    onDevicePixelRatioChanged: {
-        // Do not make this patch to QtWebKit a hard requirement.
-        if (experimental.hasOwnProperty('devicePixelRatio')) {
-            experimental.devicePixelRatio = devicePixelRatio
+    QtObject {
+        property real devicePixelRatio: QtWebKitDPR
+        onDevicePixelRatioChanged: {
+            // Do not make this patch to QtWebKit a hard requirement.
+            if (_webview.experimental.hasOwnProperty('devicePixelRatio')) {
+                _webview.experimental.devicePixelRatio = devicePixelRatio
+            }
         }
     }
 

=== modified file 'src/Ubuntu/Components/Extras/Browser/plugin.cpp'
--- src/Ubuntu/Components/Extras/Browser/plugin.cpp	2013-08-09 07:35:51 +0000
+++ src/Ubuntu/Components/Extras/Browser/plugin.cpp	2013-10-09 11:43:11 +0000
@@ -35,9 +35,18 @@
 #include <QtCore/QThread>
 #include <QtQml>
 
+static float getQtWebkitDpr()
+{
+    QByteArray stringValue = qgetenv("QTWEBKIT_DPR");
+    bool ok = false;
+    float value = stringValue.toFloat(&ok);
+    return ok ? value : 1.0;
+}
+
 void UbuntuBrowserPlugin::initializeEngine(QQmlEngine* engine, const char* uri)
 {
     Q_UNUSED(uri);
+
     QDir dataLocation(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
     if (!dataLocation.exists()) {
         QDir::root().mkpath(dataLocation.absolutePath());
@@ -45,6 +54,10 @@
     QQmlContext* context = engine->rootContext();
     context->setContextProperty("dataLocation", dataLocation.absolutePath());
 
+    // Set the desired pixel ratio (not needed once we use Qt’s way of
+    // calculating the proper pixel ratio by device/screen).
+    context->setContextProperty("QtWebKitDPR", getQtWebkitDpr());
+
     // This singleton lives in its own thread to ensure that
     // disk I/O is not performed in the UI thread.
     WebThumbnailUtils& utils = WebThumbnailUtils::instance();

=== modified file 'src/app/Browser.qml'
--- src/app/Browser.qml	2013-10-07 19:01:57 +0000
+++ src/app/Browser.qml	2013-10-09 11:43:11 +0000
@@ -29,7 +29,6 @@
     id: browser
 
     property bool chromeless: false
-    property real qtwebkitdpr
     property bool developerExtrasEnabled: false
 
     property var webappUrlPatterns: null
@@ -358,8 +357,6 @@
             enabled: stack.depth === 0
             visible: tabsModel.currentWebview === webview
 
-            devicePixelRatio: browser.qtwebkitdpr
-
             experimental.preferences.developerExtrasEnabled: browser.developerExtrasEnabled
 
             experimental.certificateVerificationDialog: CertificateVerificationDialog { }

=== modified file 'src/app/webbrowser-app.cpp'
--- src/app/webbrowser-app.cpp	2013-09-25 15:33:02 +0000
+++ src/app/webbrowser-app.cpp	2013-10-09 11:43:11 +0000
@@ -32,17 +32,6 @@
 #include "webbrowser-app.h"
 #include "webbrowser-window.h"
 
-
-static float getQtWebkitDpr()
-{
-    const char* envVar = "QTWEBKIT_DPR";
-    QByteArray stringValue = qgetenv(envVar);
-    bool ok;
-    float value = stringValue.toFloat(&ok);
-    float defaultValue = 1.0;
-    return ok ? value : defaultValue;
-}
-
 WebBrowserApp::WebBrowserApp(int& argc, char** argv)
     : QApplication(argc, argv)
     , m_arguments(0)
@@ -158,11 +147,6 @@
         browser->setProperty("webappUrlPatterns", urlPatterns);
     }
 
-    // Set the desired pixel ratio (not needed once we use Qt's way of calculating
-    // the proper pixel ratio by device/screen)
-    float webkitDpr = getQtWebkitDpr();
-    browser->setProperty("qtwebkitdpr", webkitDpr);
-
     // When a webapp is being launched (by name), the url is pulled from its 'homepage'.
     QUrl url;
     if (m_arguments->webappName().isEmpty()) {

=== modified file 'src/app/webbrowser-app.qml'
--- src/app/webbrowser-app.qml	2013-09-24 21:46:50 +0000
+++ src/app/webbrowser-app.qml	2013-10-09 11:43:11 +0000
@@ -22,7 +22,6 @@
 
 Window {
     property alias chromeless: browser.chromeless
-    property alias qtwebkitdpr: browser.qtwebkitdpr
     property alias developerExtrasEnabled: browser.developerExtrasEnabled
 
     property alias webappUrlPatterns: browser.webappUrlPatterns