Merge lp:~osomon/webbrowser-app/topsites-previews into lp:webbrowser-app

[Olivier Tilloy]

Take a capture of the current page shortly after it has finished loading to give rendering an opportunity to complete.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1346
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2618/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1371
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1371/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1371
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4917
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6434
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6434/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27490

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

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/topsites-previews]

1347. By Olivier Tilloy on 2016-02-15

Add a placeholder asset for missing previews.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1347
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2621/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6470
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1374
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1374/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1374
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4948
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6481
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6481/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27581

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

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/topsites-previews]

1348. By Olivier Tilloy on 2016-02-15

Update an existing autopilot test.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1348
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2622/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6476
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1375
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1375
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1375/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1375
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4952
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6487
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6487/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27597

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/BrowserTab.qml'
--- src/app/webbrowser/BrowserTab.qml	2015-12-10 17:10:37 +0000
+++ src/app/webbrowser/BrowserTab.qml	2016-02-16 16:31:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -168,6 +168,29 @@
         }
     }
 
+    // Take a capture of the current page shortly after it has finished
+    // loading to give rendering an opportunity to complete. There is
+    // unfortunately no signal to notify us when rendering has completed.
+    Timer {
+        id: delayedCapture
+        interval: 500
+        onTriggered: {
+            if (webview && current && visible && !internal.hiding) {
+                webview.grabToImage(function(result) {
+                    PreviewManager.saveToDisk(result, url)
+                })
+            }
+        }
+    }
+    Connections {
+        target: webview
+        onLoadingStateChanged: {
+            if (!webview.loading && !webview.incognito) {
+                delayedCapture.restart()
+            }
+        }
+    }
+
     onAboutToShow: {
         if (!current) {
             opacity = 0

=== modified file 'src/app/webbrowser/UrlPreviewDelegate.qml'
--- src/app/webbrowser/UrlPreviewDelegate.qml	2015-10-16 07:55:02 +0000
+++ src/app/webbrowser/UrlPreviewDelegate.qml	2016-02-16 16:31:38 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -79,10 +79,14 @@
             anchors.left: parent.left
             width: units.gu(26)
             height: units.gu(16)
+            backgroundColor: "#f7f7f7"
+
+            property url previewUrl: Qt.resolvedUrl(PreviewManager.previewPathFromUrl(preview.url))
+            readonly property bool hasPreview: FileOperations.exists(previewUrl)
 
             source: Image {
                 id: previewImage
-                source: FileOperations.exists(previewShape.previewUrl) ? previewShape.previewUrl : ""
+                source: previewShape.hasPreview ? previewShape.previewUrl : ""
                 sourceSize.width: previewShape.width
                 cache: false
             }
@@ -90,12 +94,10 @@
             sourceHorizontalAlignment: UbuntuShape.AlignLeft
             sourceVerticalAlignment: UbuntuShape.AlignTop
 
-            property url previewUrl: Qt.resolvedUrl(PreviewManager.previewPathFromUrl(preview.url))
-
             Connections {
                 target: PreviewManager
                 onPreviewSaved: {
-                    if (pageUrl !== preview.url) return
+                    if (pageUrl != preview.url) return
                     previewImage.source = ""
                     previewImage.source = previewShape.previewUrl
                 }
@@ -105,6 +107,14 @@
                 preview.setCurrent()
                 PopupUtils.open(contextMenuComponent, previewShape)
             }
+
+            Image {
+                anchors.centerIn: parent
+                width: units.gu(2.5)
+                height: units.gu(2.5)
+                source: previewShape.hasPreview ? "" : "assets/stock_website.png"
+                fillMode: Image.PreserveAspectFit
+            }
         }
     }
 

=== added file 'src/app/webbrowser/assets/stock_website.png'
Binary files src/app/webbrowser/assets/stock_website.png	1970-01-01 00:00:00 +0000 and src/app/webbrowser/assets/stock_website.png	2016-02-16 16:31:38 +0000 differ
=== modified file 'tests/autopilot/webbrowser_app/tests/test_site_previews.py'
--- tests/autopilot/webbrowser_app/tests/test_site_previews.py	2015-11-19 11:48:10 +0000
+++ tests/autopilot/webbrowser_app/tests/test_site_previews.py	2016-02-16 16:31:38 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright 2015 Canonical
+# Copyright 2015-2016 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
@@ -91,12 +91,14 @@
         self.populate_captures_dir(history + [other_url, not_hash, not_image])
 
         self.launch_app()
-        time.sleep(0.5)  # wait for file system to settle
+        time.sleep(1)  # wait for file system to settle
 
         # verify that non-image files and top 10 sites are left alone,
         # everything else is cleaned up
         topsites = history[0:10]
-        self.assertThat(self.captures_dir, DirContains(topsites + [not_image]))
+        current_tab = self.capture_file(self.url)
+        self.assertThat(self.captures_dir,
+                        DirContains(topsites + [not_image, current_tab]))
 
 
 class TestSitePreviews(TestSitePreviewsBase):