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

[Olivier Tilloy]

Toggle application-level fullscreen when pressing F11.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1099
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1902/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/659
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/659
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/659/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/659
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2704
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3233
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3233/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21251

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/BrowserWindow.qml'
--- src/app/BrowserWindow.qml	2015-04-07 14:30:52 +0000
+++ src/app/BrowserWindow.qml	2015-06-17 14:29:48 +0000
@@ -39,14 +39,16 @@
 
     Connections {
         target: window.currentWebview
-        onFullscreenChanged: {
-            if (!window.forceFullscreen) {
-                if (window.currentWebview.fullscreen) {
-                    internal.currentWindowState = window.visibility
-                    window.visibility = Window.FullScreen
-                } else {
-                    window.visibility = internal.currentWindowState
-                }
+        onFullscreenChanged: window.setFullscreen(window.currentWebview.fullscreen)
+    }
+
+    function setFullscreen(fullscreen) {
+        if (!window.forceFullscreen) {
+            if (fullscreen) {
+                internal.currentWindowState = window.visibility
+                window.visibility = Window.FullScreen
+            } else {
+                window.visibility = internal.currentWindowState
             }
         }
     }

=== modified file 'src/app/ChromeController.qml'
--- src/app/ChromeController.qml	2015-05-11 19:12:03 +0000
+++ src/app/ChromeController.qml	2015-06-17 14:29:48 +0000
@@ -26,20 +26,27 @@
     property bool forceHide: false
     property int defaultMode: Oxide.LocationBarController.ModeAuto
 
-    onForceHideChanged: {
-        if (!webview) {
-            return
-        }
-        webview.locationBarController.animated = false
-        if (forceHide) {
-            webview.locationBarController.mode = Oxide.LocationBarController.ModeHidden
-        } else if (!webview.fullscreen) {
-            webview.locationBarController.mode = defaultMode
-            if (webview.locationBarController.mode == Oxide.LocationBarController.ModeAuto) {
-                webview.locationBarController.show(false)
-            }
-        }
-        webview.locationBarController.animated = true
+    onWebviewChanged: internal.updateVisibility()
+    onForceHideChanged: internal.updateVisibility()
+
+    QtObject {
+        id: internal
+
+        function updateVisibility() {
+            if (!webview) {
+                return
+            }
+            webview.locationBarController.animated = false
+            if (forceHide) {
+                webview.locationBarController.mode = Oxide.LocationBarController.ModeHidden
+            } else if (!webview.fullscreen) {
+                webview.locationBarController.mode = defaultMode
+                if (webview.locationBarController.mode == Oxide.LocationBarController.ModeAuto) {
+                    webview.locationBarController.show(false)
+                }
+            }
+            webview.locationBarController.animated = true
+        }
     }
 
     Connections {
@@ -63,6 +70,7 @@
         onLoadEvent: {
             // When loading, force ModeShown until the load is committed or stopped,
             // to work around https://launchpad.net/bugs/1453908.
+            if (forceHide) return
             if (event.type == Oxide.LoadEvent.TypeStarted) {
                 webview.locationBarController.mode = Oxide.LocationBarController.ModeShown
             } else if ((event.type == Oxide.LoadEvent.TypeCommitted) ||

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-06-17 14:29:48 +0000
+++ src/app/webbrowser/Browser.qml	2015-06-17 14:29:48 +0000
@@ -33,6 +33,9 @@
 BrowserView {
     id: browser
 
+    // Should be true when the containing window is fullscreen.
+    property bool fullscreen: false
+
     currentWebview: tabsModel && tabsModel.currentTab ? tabsModel.currentTab.webview : null
 
     property var historyModel: (historyModelLoader.status == Loader.Ready) ? historyModelLoader.item : null
@@ -142,13 +145,6 @@
                 top: recentView.visible ? invisibleTabChrome.bottom : parent.top
             }
             height: parent.height - osk.height - (recentView.visible ? invisibleTabChrome.height : 0)
-
-            Keys.onEscapePressed: {
-                if (browser.currentWebview && browser.currentWebview.fullscreen) {
-                    event.accepted = true
-                    browser.currentWebview.fullscreen = false
-                }
-            }
         }
 
         Loader {
@@ -362,7 +358,7 @@
         ChromeController {
             id: chromeController
             webview: browser.currentWebview
-            forceHide: recentView.visible
+            forceHide: recentView.visible || browser.fullscreen
             defaultMode: (formFactor == "desktop") ? Oxide.LocationBarController.ModeShown
                                                    : Oxide.LocationBarController.ModeAuto
         }

=== modified file 'src/app/webbrowser/webbrowser-app.qml'
--- src/app/webbrowser/webbrowser-app.qml	2015-03-23 22:35:12 +0000
+++ src/app/webbrowser/webbrowser-app.qml	2015-06-17 14:29:48 +0000
@@ -17,6 +17,7 @@
  */
 
 import QtQuick 2.0
+import QtQuick.Window 2.1
 import Ubuntu.Components 1.1
 import ".."
 
@@ -43,7 +44,25 @@
         webbrowserWindow: webbrowserWindowProxy
         developerExtrasEnabled: window.developerExtrasEnabled
 
+        fullscreen: window.visibility === Window.FullScreen
+
         Component.onCompleted: i18n.domain = "webbrowser-app"
+
+        Keys.onPressed: {
+            if ((event.key === Qt.Key_F11) && (event.modifiers === Qt.NoModifier)) {
+                // F11 to toggle application-level fullscreen
+                window.setFullscreen(window.visibility !== Window.FullScreen)
+                if (currentWebview.fullscreen) {
+                    currentWebview.fullscreen = false
+                }
+            }
+        }
+        Keys.onEscapePressed: {
+            // ESC to exit fullscreen, regardless of whether it was requested
+            // by the page or toggled on by the user.
+            window.setFullscreen(false)
+            currentWebview.fullscreen = false
+        }
     }
 
     // Handle runtime requests to open urls as defined

=== modified file 'tests/autopilot/webbrowser_app/tests/test_fullscreen.py'
--- tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2015-04-17 15:46:11 +0000
+++ tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2015-06-17 14:29:48 +0000
@@ -16,51 +16,139 @@
 
 from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
 
+import testtools
 from testtools.matchers import Equals, LessThan
 from autopilot.matchers import Eventually
 from autopilot.platform import model
 
 
-class TestFullscreen(StartOpenRemotePageTestCaseBase):
+class TestFullscreenBase(StartOpenRemotePageTestCaseBase):
 
     # Ref: http://doc.qt.io/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.main_window.go_to_url(url)
-        self.main_window.wait_until_page_loaded(url)
-        self.assert_eventually_windowed()
+    def assert_webview_fullscreen(self, fullscreen):
+        self.assertThat(self.main_window.get_current_webview().fullscreen,
+                        Eventually(Equals(fullscreen)))
+
+    def assert_window_fullscreen(self, fullscreen):
+        if fullscreen:
+            self.assertThat(self.main_window.get_window().visibility,
+                            Eventually(Equals(self.QWINDOW_FULLSCREEN)))
+        else:
+            self.assertThat(self.main_window.get_window().visibility,
+                            Eventually(LessThan(self.QWINDOW_FULLSCREEN)))
+
+
+class TestPageInitiatedFullscreen(TestFullscreenBase):
+
+    def setUp(self):
+        super(TestPageInitiatedFullscreen, self).setUp(path="/fullscreen")
+        self.assert_webview_fullscreen(False)
+        self.assert_window_fullscreen(False)
         webview = self.main_window.get_current_webview()
         self.pointing_device.click_object(webview)
-        self.assert_eventually_fullscreen()
+        self.assert_webview_fullscreen(True)
+        self.assert_window_fullscreen(True)
+
+    def test_page_initiated_exit(self):
+        webview = self.main_window.get_current_webview()
         hint = webview.wait_select_single(objectName="fullscreenExitHint")
         self.pointing_device.click_object(webview)
-        self.assert_eventually_windowed()
+        self.assert_webview_fullscreen(False)
+        self.assert_window_fullscreen(False)
         hint.wait_until_destroyed()
 
-    def test_exit_fullscreen(self):
-        url = self.base_url + "/fullscreen"
-        self.main_window.go_to_url(url)
-        self.main_window.wait_until_page_loaded(url)
-        webview = self.main_window.get_current_webview()
-        self.pointing_device.click_object(webview)
-        self.assert_eventually_fullscreen()
-        if model() == 'Desktop':
-            self.keyboard.press_and_release('Escape')
-        else:
-            self.open_tabs_view()
-        self.assert_eventually_windowed()
+    @testtools.skipIf(model() == "Desktop", "on touch devices only")
+    def test_user_exit_swipe_up(self):
+        self.open_tabs_view()
+        self.assert_webview_fullscreen(False)
+        self.assert_window_fullscreen(False)
+
+    @testtools.skipIf(model() != "Desktop", "on desktop only")
+    def test_user_exit_ESC(self):
+        self.main_window.press_key('Escape')
+        self.assert_webview_fullscreen(False)
+        self.assert_window_fullscreen(False)
+
+    @testtools.skipIf(model() != "Desktop", "on desktop only")
+    def test_user_exit_F11(self):
+        self.main_window.press_key('F11')
+        self.assert_webview_fullscreen(False)
+        self.assert_window_fullscreen(False)
+
+
[e-mail](model() != "Desktop", "on desktop only")
+class TestUserInitiatedFullscreen(TestFullscreenBase):
+
+    def setUp(self):
+        super(TestUserInitiatedFullscreen, self).setUp()
+        self.assert_webview_fullscreen(False)
+        self.assert_window_fullscreen(False)
+        self.main_window.press_key('F11')
+        self.assert_window_fullscreen(True)
+        self.assert_webview_fullscreen(False)
+
+    def test_user_exit_ESC(self):
+        self.main_window.press_key('Escape')
+        self.assert_window_fullscreen(False)
+        self.assert_webview_fullscreen(False)
+
+    def test_user_exit_F11(self):
+        self.main_window.press_key('F11')
+        self.assert_window_fullscreen(False)
+        self.assert_webview_fullscreen(False)
+
+
+class TestForcedFullscreen(TestFullscreenBase):
+
+    def setUp(self):
+        self.ARGS = self.ARGS + ["--fullscreen"]
+        super(TestForcedFullscreen, self).setUp(path="/fullscreen")
+        self.assert_window_fullscreen(True)
+        self.assert_webview_fullscreen(False)
+
+    def tearDown(self):
+        super(TestForcedFullscreen, self).tearDown()
+        self.assert_window_fullscreen(True)
+
+    @testtools.skipIf(model() == "Desktop", "on touch devices only")
+    def test_disabled_user_exit_swipe_up(self):
+        self.open_tabs_view()
+
+    @testtools.skipIf(model() != "Desktop", "on desktop only")
+    def test_disabled_user_exit_ESC(self):
+        self.main_window.press_key('Escape')
+
+    @testtools.skipIf(model() != "Desktop", "on desktop only")
+    def test_disabled_user_exit_F11(self):
+        self.main_window.press_key('F11')
+
+    def trigger_page_fullscreen(self):
+        webview = self.main_window.get_current_webview()
+        self.pointing_device.click_object(webview)
+        self.assert_webview_fullscreen(True)
+
+    def test_page_exit(self):
+        self.trigger_page_fullscreen()
+        webview = self.main_window.get_current_webview()
+        self.pointing_device.click_object(webview)
+        self.assert_webview_fullscreen(False)
+
+    @testtools.skipIf(model() == "Desktop", "on touch devices only")
+    def test_user_exit_swipe_up(self):
+        self.trigger_page_fullscreen()
+        self.open_tabs_view()
+        self.assert_webview_fullscreen(False)
+
+    @testtools.skipIf(model() != "Desktop", "on desktop only")
+    def test_user_exit_ESC(self):
+        self.trigger_page_fullscreen()
+        self.main_window.press_key('Escape')
+        self.assert_webview_fullscreen(False)
+
+    @testtools.skipIf(model() != "Desktop", "on desktop only")
+    def test_user_exit_F11(self):
+        self.trigger_page_fullscreen()
+        self.main_window.press_key('F11')
+        self.assert_webview_fullscreen(False)