Merge lp:~osomon/webbrowser-app/zoomFactor into lp:webbrowser-app

[Olivier Tilloy]

Keyboard shortcuts for zoom factor:
 - Ctrl+Plus: zoom in
 - Ctrl+Minus: zoom out
 - Ctrl+0: reset zoom factor to 100%

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1429
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2704/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6868/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1457/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1457/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1457/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6879/console

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

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1429
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/462/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/464/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/464
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/463
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/463
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/470
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/470/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/470/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/470
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/470/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/470
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/470/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/470
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/470/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/470
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/470/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/462/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/zoomFactor]

1430. By Olivier Tilloy on 2016-05-16

Merge the latest changes from trunk and resolve a minor conflict.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1430
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/496/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/498/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/498
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/490/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/490/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/496/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/zoomFactor]

1431. By Olivier Tilloy on 2016-05-23

Merge the latest changes from trunk and resolve a couple of minor conflicts.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1431
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/503/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/505/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/505
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/497/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/497/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/503/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2016-05-19 18:39:19 +0000
+++ debian/control	2016-05-23 15:50:35 +0000
@@ -45,7 +45,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          fonts-liberation,
-         liboxideqt-qmlplugin (>= 1.12),
+         liboxideqt-qmlplugin (>= 1.15),
          libqt5sql5-sqlite,
          qml-module-qt-labs-folderlistmodel,
          qml-module-qt-labs-settings,

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-05-19 18:39:30 +0000
+++ src/app/webbrowser/Browser.qml	2016-05-23 15:50:35 +0000
@@ -19,7 +19,7 @@
 import QtQuick 2.4
 import QtQuick.Window 2.2
 import Qt.labs.settings 1.0
-import com.canonical.Oxide 1.12 as Oxide
+import com.canonical.Oxide 1.15 as Oxide
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 import Unity.InputInfo 0.1
@@ -1457,6 +1457,18 @@
         readonly property bool hasMouse: (miceModel.count + touchPadModel.count) > 0
         readonly property bool hasTouchScreen: touchScreenModel.count > 0
 
+        // Ref: https://code.google.com/p/chromium/codesearch#chromium/src/components/ui/zoom/page_zoom_constants.cc
+        readonly property var zoomFactors: [0.25, 0.333, 0.5, 0.666, 0.75, 0.9, 1.0,
+                                            1.1, 1.25, 1.5, 1.75, 2.0, 2.5, 3.0, 4.0, 5.0]
+        function changeZoomFactor(offset) {
+            for (var i = 0; i < zoomFactors.length; ++i) {
+                if (Math.abs(zoomFactors[i] - currentWebview.zoomFactor) <= 0.001) {
+                    currentWebview.zoomFactor = zoomFactors[i + offset]
+                    return
+                }
+            }
+        }
+
         function getOpenPages() {
             var urls = []
             for (var i = 0; i < tabsModel.count; i++) {
@@ -2114,6 +2126,29 @@
         onActivated: currentWebview.findController.previous()
     }
 
+    // Ctrl+Plus: zoom in
+    Shortcut {
+        sequence: StandardKey.ZoomIn
+        enabled: currentWebview &&
+                 ((currentWebview.maximumZoomFactor - currentWebview.zoomFactor) > 0.001)
+        onActivated: internal.changeZoomFactor(1)
+    }
+
+    // Ctrl+Minus: zoom out
+    Shortcut {
+        sequence: StandardKey.ZoomOut
+        enabled: currentWebview &&
+                 ((currentWebview.zoomFactor - currentWebview.minimumZoomFactor) > 0.001)
+        onActivated: internal.changeZoomFactor(-1)
+    }
+
+    // Ctrl+0: reset zoom factor to 1.0
+    Shortcut {
+        sequence: "Ctrl+0"
+        enabled: currentWebview && (currentWebview.zoomFactor != 1.0)
+        onActivated: currentWebview.zoomFactor = 1.0
+    }
+
     Loader {
         id: contentHandlerLoader
         source: "../ContentHandler.qml"

=== modified file 'tests/autopilot/webbrowser_app/tests/test_keyboard.py'
--- tests/autopilot/webbrowser_app/tests/test_keyboard.py	2016-05-05 10:09:48 +0000
+++ tests/autopilot/webbrowser_app/tests/test_keyboard.py	2016-05-23 15:50:35 +0000
@@ -19,7 +19,7 @@
 import time
 import testtools
 
-from testtools.matchers import Equals, NotEquals, GreaterThan
+from testtools.matchers import Equals, Mismatch, NotEquals, GreaterThan
 from autopilot.matchers import Eventually
 from autopilot.platform import model
 
@@ -57,6 +57,19 @@
         connection.close()
 
 
+class AlmostEquals(object):
+
+    def __init__(self, expected):
+        self.expected = expected
+
+    def match(self, actual):
+        if round(actual - self.expected, 3) == 0:
+            return None
+        else:
+            msg = "{} is not almost equal to {}"
+            return Mismatch(msg.format(actual, self.expected))
+
+
 @testtools.skipIf(model() != "Desktop", "on desktop only")
 class TestKeyboard(PrepopulatedDatabaseTestCaseBase):
 
@@ -524,3 +537,38 @@
         self.main_window.press_key('Ctrl+t')
         self.address_bar.activeFocus.wait_for(True)
         self.assertThat(self.address_bar.text, Eventually(Equals("")))
+
+    def test_zoom_in_and_out(self):
+        webview = self.main_window.get_current_webview()
+        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.0)))
+
+        zooms = [1.1, 1.25, 1.5, 1.75, 2.0, 2.5, 3.0, 4.0, 5.0]
+        for zoom in zooms:
+            self.main_window.press_key('Ctrl+plus')
+            self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(zoom)))
+
+        self.main_window.press_key('Ctrl+0')
+        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.0)))
+
+        zooms = [0.9, 0.75, 0.666, 0.5, 0.333, 0.25]
+        for zoom in zooms:
+            self.main_window.press_key('Ctrl+minus')
+            self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(zoom)))
+
+        self.main_window.press_key('Ctrl+0')
+        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.0)))
+
+    def test_zoom_affects_domain(self):
+        webview = self.main_window.get_current_webview()
+        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.0)))
+
+        self.open_tabs(1)
+        self.check_tab_number(1)
+        self.main_window.press_key('Ctrl+plus')
+        webview = self.main_window.get_current_webview()
+        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.1)))
+
+        self.main_window.press_key('Ctrl+Tab')
+        self.check_tab_number(0)
+        webview = self.main_window.get_current_webview()
+        self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.1)))