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

[Olivier Tilloy]

Honour fullscreen requests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:569
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/873/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/979
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/885
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1745
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1745/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8565
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1027
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1027/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/Ubuntu/Web/UbuntuWebView02.qml'
--- src/Ubuntu/Web/UbuntuWebView02.qml	2014-06-09 10:44:22 +0000
+++ src/Ubuntu/Web/UbuntuWebView02.qml	2014-06-11 11:12:28 +0000
@@ -162,6 +162,8 @@
         }
     }
 
+    onFullscreenRequested: _webview.fullscreen = fullscreen
+
     onJavaScriptConsoleMessage: {
         var msg = "[JS] (%1:%2) %3".arg(sourceId).arg(lineNumber).arg(message)
         if (level === Oxide.WebView.LogSeverityVerbose) {

=== modified file 'src/app/PanelLoader.qml'
--- src/app/PanelLoader.qml	2014-04-25 16:47:14 +0000
+++ src/app/PanelLoader.qml	2014-06-11 11:12:28 +0000
@@ -63,6 +63,7 @@
             }
             height: units.gu(8)
 
+            locked: chromePanel.currentWebview ? chromePanel.currentWebview.fullscreen : false
             Component.onCompleted: open()
             onOpenedChanged: {
                 if (!opened) {
@@ -144,4 +145,13 @@
             }
         }
     }
+
+    Connections {
+        target: chromePanel.currentWebview
+        onFullscreenChanged: {
+            if (chromePanel.currentWebview.fullscreen) {
+                chromePanel.close()
+            }
+        }
+    }
 }

=== modified file 'src/app/webbrowser/webbrowser-app.qml'
--- src/app/webbrowser/webbrowser-app.qml	2014-04-15 09:20:01 +0000
+++ src/app/webbrowser/webbrowser-app.qml	2014-06-11 11:12:28 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import QtQuick.Window 2.0
+import QtQuick.Window 2.1
 import Ubuntu.Components 0.1
 
 Window {
@@ -47,6 +47,8 @@
         Component.onCompleted: i18n.domain = "webbrowser-app"
     }
 
+    visibility: browser.currentWebview && browser.currentWebview.fullscreen ? Window.FullScreen : Window.AutomaticVisibility
+
     function newTab(url, setCurrent) {
         return browser.openUrlInNewTab(url, setCurrent)
     }

=== modified file 'src/app/webcontainer/webapp-container.qml'
--- src/app/webcontainer/webapp-container.qml	2014-05-30 12:37:26 +0000
+++ src/app/webcontainer/webapp-container.qml	2014-06-11 11:12:28 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import QtQuick.Window 2.0
+import QtQuick.Window 2.1
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Extras.Browser 0.2
 import webcontainer.private 0.1
@@ -84,6 +84,8 @@
         }
     }
 
+    visibility: webappPageComponentLoader.item && webappPageComponentLoader.item.currentWebview.fullscreen ? Window.FullScreen : Window.AutomaticVisibility
+
     Loader {
         id: accountsPageComponentLoader
         anchors.fill: parent

=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
--- tests/autopilot/webbrowser_app/emulators/browser.py	2014-05-26 09:37:08 +0000
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2014-06-11 11:12:28 +0000
@@ -27,6 +27,9 @@
     An emulator class that makes it easy to interact with the webbrowser app.
     """
 
+    def get_window(self):
+        return self.get_parent()
+
     def get_toolbar(self):
         # Overridden since the browser doesn’t use the MainView’s Toolbar.
         return self.select_single(Panel)

=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
--- tests/autopilot/webbrowser_app/tests/__init__.py	2014-05-26 09:37:08 +0000
+++ tests/autopilot/webbrowser_app/tests/__init__.py	2014-06-11 11:12:28 +0000
@@ -69,7 +69,6 @@
         else:
             self.app = self.launch_test_application(
                 "webbrowser-app",
-                "--fullscreen",
                 self.d_f,
                 *self.ARGS,
                 app_type='qt',

=== modified file 'tests/autopilot/webbrowser_app/tests/http_server.py'
--- tests/autopilot/webbrowser_app/tests/http_server.py	2014-05-22 07:25:36 +0000
+++ tests/autopilot/webbrowser_app/tests/http_server.py	2014-06-11 11:12:28 +0000
@@ -101,6 +101,20 @@
             html += '<div style="height: 100%"></div></a>'
             html += '</body></html>'
             self.send_html(html)
+        elif self.path == "/fullscreen":
+            # craft a page that accepts clicks anywhere inside its window
+            # to toggle fullscreen mode on/off
+            self.send_response(200)
+            html = '<html><body style="margin: 0">'
+            html += '<a id="fullscreen"><div style="height: 100%"></div></a>'
+            html += '</body><script>'
+            html += 'document.getElementById("fullscreen").addEventListener('
+            html += '"click", function(event) { '
+            html += 'if (!document.webkitFullscreenElement) { '
+            html += 'document.documentElement.webkitRequestFullscreen(); '
+            html += '} else { document.webkitExitFullscreen(); } });'
+            html += '</script></html>'
+            self.send_html(html)
         else:
             self.send_error(404)
 

=== added file 'tests/autopilot/webbrowser_app/tests/test_fullscreen.py'
--- tests/autopilot/webbrowser_app/tests/test_fullscreen.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2014-06-11 11:12:28 +0000
@@ -0,0 +1,51 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright 2014 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program 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/>.
+
+from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
+
+from testtools.matchers import Equals, LessThan
+from autopilot.matchers import Eventually
+
+
+class TestFullscreen(StartOpenRemotePageTestCaseBase):
+
+    # Ref: http://qt-project.org/doc/qt-5/qwindow.html#Visibility-enum
+    QWINDOW_FULLSCREEN = 5
+
+    def assert_eventually_windowed(self):
+        self.assertThat(self.main_window.get_current_webview().fullscreen,
+                        Eventually(Equals(False)))
+        self.assertThat(self.main_window.get_window().visibility,
+                        Eventually(LessThan(self.QWINDOW_FULLSCREEN)))
+
+    def assert_eventually_fullscreen(self):
+        self.assertThat(self.main_window.get_current_webview().fullscreen,
+                        Eventually(Equals(True)))
+        self.assertThat(self.main_window.get_window().visibility,
+                        Eventually(Equals(self.QWINDOW_FULLSCREEN)))
+
+    def test_toggle_fullscreen(self):
+        self.assert_eventually_windowed()
+        url = self.base_url + "/fullscreen"
+        self.go_to_url(url)
+        self.assert_page_eventually_loaded(url)
+        self.assert_eventually_windowed()
+        webview = self.main_window.get_current_webview()
+        self.pointing_device.click_object(webview)
+        self.assert_eventually_fullscreen()
+        webview = self.main_window.get_current_webview()
+        self.pointing_device.click_object(webview)
+        self.assert_eventually_windowed()

=== modified file 'tests/autopilot/webbrowser_app/tests/test_title.py'
--- tests/autopilot/webbrowser_app/tests/test_title.py	2014-04-24 10:09:42 +0000
+++ tests/autopilot/webbrowser_app/tests/test_title.py	2014-06-11 11:12:28 +0000
@@ -26,11 +26,5 @@
 
     def test_window_title(self):
         self.go_to_url(self.base_url + "/aleaiactaest")
-        #window = self.app.select_single("QQuickWindow")
-        # XXX: for some reason, autopilot finds two instances of QQuickWindow.
-        # One is the correct one, and the other one is not visible, its
-        # dimensions are 0×0, it has no title, its parent is the webbrowser-app
-        # object, and it has no children.
-        # See https://bugs.launchpad.net/bugs/1248620.
-        window = self.app.select_single("QQuickWindow", visible=True)
-        self.assertThat(window.title, Eventually(Contains("Alea Iacta Est")))
+        self.assertThat(self.main_window.get_window().title,
+                        Eventually(Contains("Alea Iacta Est")))