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

[Olivier Tilloy]

Remove the temporary workaround for bug #1328839 as fullscreen switching is now fully functional in qtubuntu.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:750
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1131/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5522
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3932
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/330
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/330/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6774
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6774/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14181
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3307
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4250
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4250/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:750
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3935
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/331
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/331/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6780
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6780/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3310
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4253
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4253/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'src/app/webbrowser/webbrowser-app.qml'
--- src/app/webbrowser/webbrowser-app.qml	2014-08-21 11:28:44 +0000
+++ src/app/webbrowser/webbrowser-app.qml	2014-10-06 10:37:06 +0000
@@ -51,9 +51,7 @@
         Component.onCompleted: i18n.domain = "webbrowser-app"
     }
 
-    // XXX: work around https://bugs.launchpad.net/unity8/+bug/1328839
-    // by toggling fullscreen on the window only on desktop.
-    visibility: browser.currentWebview && browser.currentWebview.fullscreen && (formFactor === "desktop") ? Window.FullScreen : Window.AutomaticVisibility
+    visibility: browser.currentWebview && browser.currentWebview.fullscreen ? Window.FullScreen : Window.AutomaticVisibility
 
     // Handle runtime requests to open urls as defined
     // by the freedesktop application dbus interface's open

=== modified file 'src/app/webcontainer/webapp-container.qml'
--- src/app/webcontainer/webapp-container.qml	2014-10-03 14:41:14 +0000
+++ src/app/webcontainer/webapp-container.qml	2014-10-06 10:37:06 +0000
@@ -115,10 +115,7 @@
         }
     }
 
-    // XXX: work around https://bugs.launchpad.net/unity8/+bug/1328839
-    // by toggling fullscreen on the window only on desktop.
-    visibility: browser.currentWebview && browser.currentWebview.fullscreen &&
-                (formFactor === "desktop") ? Window.FullScreen : Window.AutomaticVisibility
+    visibility: browser.currentWebview && browser.currentWebview.fullscreen ? Window.FullScreen : Window.AutomaticVisibility
 
     Loader {
         id: accountsPageComponentLoader

=== modified file 'tests/autopilot/webbrowser_app/tests/test_fullscreen.py'
--- tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2014-06-18 16:20:49 +0000
+++ tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2014-10-06 10:37:06 +0000
@@ -18,7 +18,6 @@
 
 from testtools.matchers import Equals, LessThan
 from autopilot.matchers import Eventually
-from autopilot.platform import model
 
 
 class TestFullscreen(StartOpenRemotePageTestCaseBase):
@@ -35,11 +34,6 @@
     def assert_eventually_fullscreen(self):
         self.assertThat(self.main_window.get_current_webview().fullscreen,
                         Eventually(Equals(True)))
-        if model() != 'Desktop':
-            # XXX: do not assert that the window is fullscreen
-            # on devices due to the temporary workaround for
-            # https://bugs.launchpad.net/unity8/+bug/1328839
-            return
         self.assertThat(self.main_window.get_window().visibility,
                         Eventually(Equals(self.QWINDOW_FULLSCREEN)))