Merge lp:~abreu-alexandre/webbrowser-app/theme-color-meta-detection into lp:webbrowser-app

[Alexandre Abreu]

Handle theme_color page metainformation.

Handle theme_color page meta information as described here:

https://developers.google.com/web/updates/2014/11/Support-for-theme-color-in-Chrome-39-for-Android?hl=en

Test Case
---------

1. Go to a website that supports the theme_color meta info, e.g.

http://browsernative.com/theme-color-meta-tag-chrome-android-lollipop-546/

2. MAke sure that the background color of the navigation ui is updated,

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1295
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2499/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5557
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1253
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1253
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1253/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1253
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5571
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5571/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25732

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

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

Since the tests are there, the description needs an update.

The code is good, I just wonder if we should implement some tricks on the text colour, to ensure that it's always visible against the background.

review: Approve

[lp:~abreu-alexandre/webbrowser-app/theme-color-meta-detection]

1295. By CI Train Bot Account on 2015-12-10

Resync trunk.

1296. By Launchpad Translations on behalf of phablet-team on 2015-12-11

Launchpad automatic translations update.

1297. By Launchpad Translations on behalf of phablet-team on 2015-12-12

Launchpad automatic translations update.

1298. By Zsombor Egri on 2015-12-18

Fix local Toolbar collision with UITK 1.3 Toolbar.
Approved by: Olivier Tilloy, Zoltan Balogh

1299. By Olivier Tilloy on 2015-12-18

Work around what appears to be a regression in the UITK by specifying a non-null delay when swiping a list item to delete it in unit tests. Fixes: #1526940
Approved by: Michael Sheldon

1300. By CI Train Bot Account on 2015-12-18

Releasing 0.23+16.04.20151218-0ubuntu1

1301. By Michael Sheldon on 2015-12-21

Add support for handling downloads internally within the browser. Fixes: #1354391
Approved by: Olivier Tilloy

1302. By CI Train Bot Account on 2015-12-21

Releasing 0.23+16.04.20151221-0ubuntu1

1303. By Olivier Tilloy on 2015-12-22

Update translation template.

1304. By Olivier Tilloy on 2015-12-22

Recognize openoffice and MS-office file formats as documents, now that the document viewer app knows how to render them. Fixes: #1523452
Approved by: Michael Sheldon, PS Jenkins bot

1305. By Olivier Tilloy on 2015-12-22

Do not allow interacting with tabs and the chrome while the settings page is shown. Fixes: #1524353
Approved by: PS Jenkins bot, Ugo Riboni

1306. By Olivier Tilloy on 2015-12-22

Use the screen size (diagonal in millimeters) to determine which default UA string and which UA overrides to use.
An empirical threshold of 19cm is being used, it is subject to further adjustments. Fixes: #1504084
Approved by: PS Jenkins bot

1307. By Olivier Tilloy on 2015-12-22

Add keyboard shorcuts for 'next' (Ctrl+G) and 'previous' (Ctrl+Shift+G) while in find-in-page mode. Fixes: #1522152
Approved by: PS Jenkins bot, Ugo Riboni

1308. By Olivier Tilloy on 2015-12-22

Fix the tab preview sometimes covering the tab chrome, in the tabs view.
Offset tab previews by 1px to cover the semi-transparent horizontal line at the bottom of the tab chrome asset. Fixes: #1520624
Approved by: PS Jenkins bot, Ugo Riboni

1309. By Olivier Tilloy on 2015-12-22

Fix some obvious issues in PreviewManager. Fixes: #1519019
Approved by: PS Jenkins bot, Ugo Riboni

1310. By Olivier Tilloy on 2015-12-22

Fix a crash when clearing the navigation history while the new tab view is open. Fixes: #1525937
Approved by: Ugo Riboni

1311. By Olivier Tilloy on 2015-12-22

Fix deleting multiple domains from the history view.
Add unit tests for the HistoryView component. Fixes: #1527144

1312. By CI Train Bot Account on 2015-12-22

Releasing 0.23+16.04.20151222.1-0ubuntu1

1313. By CI Train Bot Account on 2016-01-05

Resync trunk.

1314. By Launchpad Translations on behalf of phablet-team on 2016-01-06

Launchpad automatic translations update.

1315. By Alexandre Abreu on 2016-01-06

Make the webapp-container click hook more flexible. Instead of being able to delete cache & resource folders as the click is being uninstalled, one can also act on them as the click is being upgraded & installed. Fixes: #1522562
Approved by: PS Jenkins bot, Alberto Mardegan

1316. By Alexandre Abreu on 2016-01-06

Handle empty url pattern in configuration file and invalid url pattern being specified. Fixes: #1522585
Approved by: PS Jenkins bot, Alberto Mardegan

1317. By Alexandre Abreu on 2016-01-06

Handle application crashes or OOM interventions & save opened overlays Fixes: #1508969
Approved by: PS Jenkins bot, Alberto Mardegan

1318. By Alexandre Abreu on 2016-01-06

Limited handling of custom context menu for the container
Approved by: Alberto Mardegan

1319. By CI Train Bot Account on 2016-01-06

Releasing 0.23+16.04.20160106.4-0ubuntu1

1320. By Alexandre Abreu on 2016-01-08

Handle theme-color metadata

1321. By Alexandre Abreu on 2016-01-08

Add forgottten js file install

=== modified file 'src/app/ChromeBase.qml'
--- src/app/ChromeBase.qml	2015-08-10 15:22:00 +0000
+++ src/app/ChromeBase.qml	2016-01-08 19:32:31 +0000
@@ -23,6 +23,8 @@
 StyledItem {
     id: chrome
 
+    objectName: "chromeBase"
+
     property var webview
     property alias backgroundColor: backgroundRect.color
 
 
=== modified file 'src/app/webcontainer/CMakeLists.txt'
--- src/app/webcontainer/CMakeLists.txt	2015-09-29 19:31:47 +0000
+++ src/app/webcontainer/CMakeLists.txt	2016-01-08 19:32:31 +0000
@@ -40,7 +40,7 @@
 install(TARGETS ${WEBAPP_CONTAINER}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-file(GLOB QML_FILES *.qml)
+file(GLOB QML_FILES *.qml *.js)
 install(FILES ${QML_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app/webcontainer)
 install(DIRECTORY actions DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app/webcontainer
         FILES_MATCHING PATTERN *.qml)
 
=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2016-01-06 19:43:23 +0000
+++ src/app/webcontainer/WebApp.qml	2016-01-08 19:32:31 +0000
@@ -140,6 +140,11 @@
             height: parent.height - osk.height
             developerExtrasEnabled: webapp.developerExtrasEnabled
 
+            onThemeColorMetaInformationDetected: {
+                if (!webapp.chromeless && chromeLoader.item) {
+                    chromeLoader.item.backgroundColor = theme_color
+                }
+            }
             onSamlRequestUrlPatternReceived: {
                 addGeneratedUrlPattern(urlPattern)
             }
 
=== modified file 'src/app/webcontainer/WebViewImplOxide.qml'
--- src/app/webcontainer/WebViewImplOxide.qml	2016-01-06 19:43:23 +0000
+++ src/app/webcontainer/WebViewImplOxide.qml	2016-01-08 19:32:31 +0000
@@ -46,6 +46,7 @@
     property bool blockOpenExternalUrls: false
 
     signal samlRequestUrlPatternReceived(string urlPattern)
+    signal themeColorMetaInformationDetected(string theme_color)
 
     // Those signals are used for testing purposes to externally
     //  track down the various internal logic & steps of a popup lifecycle.
@@ -69,7 +70,25 @@
     context: WebContext {
         dataPath: webview.dataPath
         userAgent: localUserAgentOverride ? localUserAgentOverride : defaultUserAgent
+
+        userScripts: [
+            Oxide.UserScript {
+                context: "oxide://webapp-specific-page-metadata-collector/"
+                url: Qt.resolvedUrl("webapp-specific-page-metadata-collector.js")
+                incognitoEnabled: false
+                matchAllFrames: false
+            }
+        ]
     }
+    messageHandlers: [
+        Oxide.ScriptMessageHandler {
+            msgId: "webapp-specific-page-metadata-detected"
+            contexts: ["oxide://webapp-specific-page-metadata-collector/"]
+            callback: function(msg, frame) {
+                handlePageMetadata(msg.args)
+            }
+        }
+    ]
 
     preferences.allowFileAccessFromFileUrls: runningLocalApplication
     preferences.allowUniversalAccessFromFileUrls: runningLocalApplication
@@ -319,6 +338,30 @@
         }
     }
 
+    function handlePageMetadata(metadata) {
+        if (metadata.type === 'manifest') {
+            var request = new XMLHttpRequest();
+            request.onreadystatechange = function() {
+                if (request.readyState === XMLHttpRequest.DONE) {
+                    try {
+                        var manifest = JSON.parse(request.responseText);
+                        if (manifest['theme_color']
+                                && manifest['theme_color'].length !== 0) {
+                            themeColorMetaInformationDetected(manifest['theme_color'])
+                        }
+                    } catch(e) {}
+                }
+            }
+            request.open("GET", metadata.manifest);
+            request.send();
+        } else if (metadata.type === 'theme-color') {
+            if (metadata['theme_color']
+                    && metadata['theme_color'].length !== 0) {
+                themeColorMetaInformationDetected(metadata['theme_color'])
+            }
+        }
+    }
+
     onShowDownloadDialog: {
        if (downloadDialogLoader.status === Loader.Ready) {
            var downloadDialog = PopupUtils.open(downloadDialogLoader.item, webview, {"contentType" : contentType,
@@ -341,5 +384,4 @@
         source: "ContentPickerDialog.qml"
         asynchronous: true
     }
-
 }
 
=== modified file 'src/app/webcontainer/WebappContainerWebview.qml'
--- src/app/webcontainer/WebappContainerWebview.qml	2016-01-06 19:43:23 +0000
+++ src/app/webcontainer/WebappContainerWebview.qml	2016-01-08 19:32:31 +0000
@@ -42,6 +42,7 @@
     property bool wide: false
 
     signal samlRequestUrlPatternReceived(string urlPattern)
+    signal themeColorMetaInformationDetected(string theme_color)
 
     onWideChanged: if (webappContainerWebViewLoader.item) webappContainerWebViewLoader.item.wide = wide
 
@@ -70,6 +71,13 @@
         }
     }
 
+    Connections {
+        target: webappContainerWebViewLoader.item
+        onThemeColorMetaInformationDetected: {
+            themeColorMetaInformationDetected(theme_color)
+        }
+    }
+
     Loader {
         id: webappContainerWebViewLoader
         objectName: "containerWebviewLoader"
 
=== added file 'src/app/webcontainer/webapp-specific-page-metadata-collector.js'
--- src/app/webcontainer/webapp-specific-page-metadata-collector.js	1970-01-01 00:00:00 +0000
+++ src/app/webcontainer/webapp-specific-page-metadata-collector.js	2016-01-08 19:32:31 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app 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/>.
+ */
+
+(function() {
+    function detectThemeColorMetaInformation() {
+        var theme_color_meta =
+                document.head.querySelector('meta[name="theme-color"]');
+        if (theme_color_meta) {
+            oxide.sendMessage(
+                'webapp-specific-page-metadata-detected', {
+                    type: 'theme-color',
+                    baseurl: document.location.href,
+                    theme_color: theme_color_meta.getAttribute('content')
+                });
+            return true;
+        }
+        return false;
+    }
+    function detectManifestMetaInformation() {
+        var manifest = document.head.querySelector('link[rel="manifest"]');
+
+        if (manifest && manifest.getAttribute('href')) {
+            oxide.sendMessage(
+                'webapp-specific-page-metadata-detected', {
+                    type: 'manifest',
+                    baseurl: document.location.href,
+                    manifest: manifest.href
+                });
+            return true;
+        }
+
+        return false;
+    }
+
+    var detectors = [detectThemeColorMetaInformation, detectManifestMetaInformation]
+    for (var i in detectors) {
+        if (detectors[i]()) {
+            break;
+        }
+    }
+})();
 
=== modified file 'tests/autopilot/webapp_container/tests/fake_servers.py'
--- tests/autopilot/webapp_container/tests/fake_servers.py	2015-12-17 13:56:54 +0000
+++ tests/autopilot/webapp_container/tests/fake_servers.py	2016-01-08 19:32:31 +0000
@@ -117,6 +117,39 @@
     </html>
         """.format(loopcount)
 
+    def manifest_json_content(self):
+        return """
+{
+  "name": "Theme Color",
+  "short_name": "Theme Color",
+  "icons": [],
+  "theme_color": "#FF0000"
+}        """
+
+    def theme_color_content(self, color, with_manifest=False):
+        color_content = ''
+        if color:
+            color_content = """
+<meta name=\"theme-color\" content=\"{}\"></meta>
+""".format(color)
+        manifest_content = ''
+        if with_manifest:
+            manifest_content = "<link rel=\"manifest\" href=\"manifest.json\">"
+
+        return """
+<html>
+<head>
+{}
+{}
+<title>theme-color</title>
+<script>
+</script>
+</head>
+<body>
+</body>
+</html>
+        """.format(color_content, manifest_content)
+
     def open_close_content(self):
         return """
 <html>
@@ -187,6 +220,20 @@
         elif self.path == '/open-close-content':
             self.send_response(200)
             self.serve_content(self.open_close_content())
+        elif self.path == '/theme-color/manifest.json':
+            self.send_response(200)
+            self.serve_content(self.manifest_json_content())
+        elif self.path.startswith('/theme-color/'):
+            args = self.path[len('/theme-color/'):]
+            self.send_response(200)
+            color = ''
+            if args.startswith('?color='):
+                color = args[len('?color='):]
+            with_manifest = False
+            if args.startswith('?manifest='):
+                with_manifest = True
+            self.send_response(200)
+            self.serve_content(self.theme_color_content(color, with_manifest))
         elif self.path.startswith('/saml/'):
             args = self.path[len('/saml/'):]
             loopCount = 0
 
=== added file 'tests/autopilot/webapp_container/tests/test_page_meta_collector.py'
--- tests/autopilot/webapp_container/tests/test_page_meta_collector.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/webapp_container/tests/test_page_meta_collector.py	2016-01-08 19:32:31 +0000
@@ -0,0 +1,49 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2015 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 webapp_container.tests import WebappContainerTestCaseWithLocalContentBase
+
+from testtools.matchers import Equals
+from autopilot.matchers import Eventually
+
+
+class TestPageMetaCollector(WebappContainerTestCaseWithLocalContentBase):
+    def test_update_theme_color(self):
+        args = ['--enable-addressbar']
+        self.launch_webcontainer_app_with_local_http_server(
+            args,
+            '/theme-color/?color=red')
+        self.get_webcontainer_window().visible.wait_for(True)
+
+        chrome_base = self.app.wait_select_single(
+            objectName="chromeBase")
+
+        self.assertThat(
+            lambda: str(chrome_base.backgroundColor),
+            Eventually(Equals("Color(255, 0, 0, 255)")))
+
+    def test_update_theme_color_with_manifest(self):
+        args = ['--enable-addressbar']
+        self.launch_webcontainer_app_with_local_http_server(
+            args,
+            '/theme-color/?manifest=true')
+        self.get_webcontainer_window().visible.wait_for(True)
+
+        chrome_base = self.app.wait_select_single(
+            objectName="chromeBase")
+
+        self.assertThat(
+            lambda: str(chrome_base.backgroundColor),
+            Eventually(Equals("Color(255, 0, 0, 255)")))