Merge lp:~abreu-alexandre/webbrowser-app/handle-webapp-renderer-crash into lp:webbrowser-app

[Alexandre Abreu]

Handle webapp webview renderer crashes

Handle webapp webview renderer crashes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1188
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2268/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4309
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1022/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1022
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1022/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1022/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3511
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4306
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4306/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23572

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Has this been signed off by the design team? I mentioned to them last week that you were going to implement something similar to what exists in the browser for the webapp container, and they agreed that the wording might require some tweaking. The mention of "tabs" in the default sad tab message that is used for the browser might be misleading in the context of the webapp container, especially if no overlay is currently being displayed.

One tiny remark: the SadTab autopilot proxy object should be defined in test_sad_tab.py, since it’s not used anywhere else.

Other than that, this looks good to me and seems to work well.

[Alexandre Abreu (abreu-alexandre)]

> One tiny remark: the SadTab autopilot proxy object should be defined in
> test_sad_tab.py, since it’s not used anywhere else.

updated

> Other than that, this looks good to me and seems to work well.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1189
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2272/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1026
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1026
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1026/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1026/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4325
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4325/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23613

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/webbrowser-app/handle-webapp-renderer-crash]

1199. By CI Train Bot Account on 2015-09-23

Resync trunk.

1200. By Olivier Tilloy on 2015-09-23

Update translation template.

[Alexandre Abreu (abreu-alexandre)]

I updated the UI (and obviously the rest) to simplify it and remove the user message so that it can land in OTA-7. Once it lands I'll create a ubuntu-ux task to verify and tweak that behavior (with a more meaningful message),

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1190
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2275/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4333/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1029/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1029/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1029/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4330/console

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/webbrowser-app/handle-webapp-renderer-crash]

1201. By Launchpad Translations on behalf of phablet-team on 2015-09-24

Launchpad automatic translations update.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1191
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2279/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4345
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1033/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1033
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1033/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1033/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3541
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4342
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4342/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23642

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1192
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2282/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4351
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1036/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1036
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1036/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1036/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4348
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4348/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23650

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/webbrowser-app/handle-webapp-renderer-crash]

1202. By Launchpad Translations on behalf of phablet-team on 2015-09-25

Launchpad automatic translations update.

1203. By Launchpad Translations on behalf of phablet-team on 2015-09-26

Launchpad automatic translations update.

1204. By Launchpad Translations on behalf of phablet-team on 2015-09-27

Launchpad automatic translations update.

1205. By Launchpad Translations on behalf of phablet-team on 2015-09-28

Launchpad automatic translations update.

1206. By Michael Sheldon on 2015-09-28

Add support for alternative mimetype header for vcards Fixes: #1498992
Approved by: Olivier Tilloy

1207. By Ugo Riboni on 2015-09-28

Add a context menu to each tab in the tab bar, allowing to insert a new tab just after, close or reload the current tab.
Approved by: Riccardo Padovani

1208. By Olivier Tilloy on 2015-09-28

Fix a couple of autopilot test failures on desktop. Fixes: #1495297, #1499411

1209. By CI Train Bot Account on 2015-09-28

Releasing 0.23+15.10.20150928-0ubuntu1

1210. By CI Train Bot Account on 2015-09-29

Resync trunk.

[Olivier Tilloy (osomon)]

Let’s discuss this proposed implementation at our weekly catchup with design later today.

A side note: "SadWebview.qml" is a confusing name, given that it’s not a webview.

[lp:~abreu-alexandre/webbrowser-app/handle-webapp-renderer-crash]

1211. By Ugo Riboni on 2015-09-29

Extend the clickable area to close a tab on mobile, as taps are less precise and often end up missing it. Fixes: #1500339
Approved by: Olivier Tilloy

1212. By Olivier Tilloy on 2015-09-29

Use the UA override for www.youtube.com on mobile too. Fixes: #1499394
Approved by: Alexandre Abreu, David Barth

1213. By CI Train Bot Account on 2015-09-29

Releasing 0.23+15.10.20150929-0ubuntu1

[Alexandre Abreu (abreu-alexandre)]

Updated according to design's comment; also changed the SadWebview qml name

[lp:~abreu-alexandre/webbrowser-app/handle-webapp-renderer-crash]

1214. By Alexandre Abreu on 2015-09-29

Handle renderer crash in webapp container

1215. By Alexandre Abreu on 2015-09-29

remove uneeded signal

[Olivier Tilloy (osomon)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1193
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2299/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4418
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1053/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1053
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1053/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1053/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3594
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4415
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4415/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23771

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webcontainer/CMakeLists.txt'
--- src/app/webcontainer/CMakeLists.txt	2015-07-20 14:20:37 +0000
+++ src/app/webcontainer/CMakeLists.txt	2015-09-29 20:15:01 +0000
@@ -44,3 +44,7 @@
 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)
+
+install(DIRECTORY assets
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app/webcontainer
+        FILES_MATCHING PATTERN *.png)

=== modified file 'src/app/webcontainer/PopupWindowOverlay.qml'
--- src/app/webcontainer/PopupWindowOverlay.qml	2015-08-10 15:33:43 +0000
+++ src/app/webcontainer/PopupWindowOverlay.qml	2015-09-29 20:15:01 +0000
@@ -27,6 +27,7 @@
 
     property var popupWindowController
     property var webContext
+    property alias currentWebview: popupWebview
     property alias request: popupWebview.request
     property alias url: popupWebview.url
     
@@ -194,6 +195,21 @@
                 popupWindowController.handleViewRemoved(popup)
             }
         }
+
+        Loader {
+            anchors {
+                fill: popupWebview
+            }
+            active: webProcessMonitor.crashed || (webProcessMonitor.killed && !popupWebview.currentWebview.loading)
+            sourceComponent: SadPage {
+                webview: popupWebview
+                objectName: "overlaySadPage"
+            }
+            WebProcessMonitor {
+                id: webProcessMonitor
+                webview: popupWebview
+            }
+            asynchronous: true
+        }
     }
-
 }

=== added file 'src/app/webcontainer/SadPage.qml'
--- src/app/webcontainer/SadPage.qml	1970-01-01 00:00:00 +0000
+++ src/app/webcontainer/SadPage.qml	2015-09-29 20:15:01 +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/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Rectangle {
+    property var webview
+
+    Column {
+        anchors {
+            fill: parent
+            margins: units.gu(4)
+        }
+        spacing: units.gu(4)
+
+        Image {
+            anchors.horizontalCenter: parent.horizontalCenter
+            source: "assets/tab-error.png"
+        }
+
+        Label {
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+
+            wrapMode: Text.Wrap
+            horizontalAlignment: Text.AlignHCenter
+            text: webview ? i18n.tr("Oops, something went wrong.") : ""
+        }
+
+        Button {
+            anchors.horizontalCenter: parent.horizontalCenter
+            objectName: "reloadButton"
+            text: i18n.tr("Reload")
+            color: UbuntuColors.green
+            onClicked: webview.reload()
+        }
+    }
+}

=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2015-08-18 14:18:37 +0000
+++ src/app/webcontainer/WebApp.qml	2015-09-29 20:15:01 +0000
@@ -29,21 +29,21 @@
     id: webapp
     objectName: "webappBrowserView"
 
-    currentWebview: webview.currentWebview
+    currentWebview: containerWebView.currentWebview
 
-    property alias url: webview.url
+    property alias url: containerWebView.url
 
     property bool accountSwitcher
 
     property string webappModelSearchPath: ""
 
     property var webappUrlPatterns
-    property alias popupRedirectionUrlPrefixPattern: webview.popupRedirectionUrlPrefixPattern
-    property alias webviewOverrideFile: webview.webviewOverrideFile
-    property alias blockOpenExternalUrls: webview.blockOpenExternalUrls
-    property alias localUserAgentOverride: webview.localUserAgentOverride
-    property alias dataPath: webview.dataPath
-    property alias runningLocalApplication: webview.runningLocalApplication
+    property alias popupRedirectionUrlPrefixPattern: containerWebView.popupRedirectionUrlPrefixPattern
+    property alias webviewOverrideFile: containerWebView.webviewOverrideFile
+    property alias blockOpenExternalUrls: containerWebView.blockOpenExternalUrls
+    property alias localUserAgentOverride: containerWebView.localUserAgentOverride
+    property alias dataPath: containerWebView.dataPath
+    property alias runningLocalApplication: containerWebView.runningLocalApplication
 
     property string webappName: ""
 
@@ -60,15 +60,15 @@
 
     actions: [
         Actions.Back {
-            enabled: webapp.backForwardButtonsVisible && webview.currentWebview && webview.currentWebview.canGoBack
-            onTriggered: webview.currentWebview.goBack()
+            enabled: webapp.backForwardButtonsVisible && containerWebView.currentWebview && containerWebView.currentWebview.canGoBack
+            onTriggered: containerWebView.currentWebview.goBack()
         },
         Actions.Forward {
-            enabled: webapp.backForwardButtonsVisible && webview.currentWebview && webview.currentWebview.canGoForward
-            onTriggered: webview.currentWebview.goForward()
+            enabled: webapp.backForwardButtonsVisible && containerWebView.currentWebview && containerWebView.currentWebview.canGoForward
+            onTriggered: containerWebView.currentWebview.goForward()
         },
         Actions.Reload {
-            onTriggered: webview.currentWebview.reload()
+            onTriggered: containerWebView.currentWebview.reload()
         }
     ]
 
@@ -121,7 +121,7 @@
         anchors.fill: parent
 
         WebappContainerWebview {
-            id: webview
+            id: containerWebView
             objectName: "webview"
 
             anchors {
@@ -144,19 +144,39 @@
              * being explictly defined here.
              */
             webappName: webapp.webappName === "" ? unityWebapps.name : webapp.webappName
+
+            Loader {
+                anchors {
+                    fill: containerWebView
+                    topMargin: (!webapp.chromeless && chromeLoader.item.state == "shown")
+                               ? chromeLoader.item.height
+                               : 0
+                }
+                active: containerWebView.currentWebview &&
+                        (webProcessMonitor.crashed || (webProcessMonitor.killed && !containerWebView.currentWebview.loading))
+                sourceComponent: SadPage {
+                    webview: containerWebView.currentWebview
+                    objectName: "mainWebviewSadPage"
+                }
+                WebProcessMonitor {
+                    id: webProcessMonitor
+                    webview: containerWebView.currentWebview
+                }
+                asynchronous: true
+            }
         }
 
         Loader {
             anchors {
-                fill: webview
+                fill: containerWebView
                 topMargin: (!webapp.chromeless && chromeLoader.item.state == "shown") ? chromeLoader.item.height : 0
             }
             sourceComponent: ErrorSheet {
-                visible: webview.currentWebview && webview.currentWebview.lastLoadFailed
-                url: webview.currentWebview ? webview.currentWebview.url : ""
+                visible: containerWebView.currentWebview && containerWebView.currentWebview.lastLoadFailed
+                url: containerWebView.currentWebview ? containerWebView.currentWebview.url : ""
                 onRefreshClicked: {
-                    if (webview.currentWebview)
-                        webview.currentWebview.reload()
+                    if (containerWebView.currentWebview)
+                        containerWebView.currentWebview.reload()
                 }
             }
             asynchronous: true
@@ -186,7 +206,7 @@
                         right: parent.right
                     }
                     height: units.gu(6)
-                    y: webapp.currentWebview ? webview.currentWebview.locationBarController.offset : 0
+                    y: webapp.currentWebview ? containerWebView.currentWebview.locationBarController.offset : 0
 
                     onChooseAccount: webapp.chooseAccount()
                 }
@@ -225,7 +245,7 @@
     UnityWebApps.UnityWebApps {
         id: unityWebapps
         name: webappName
-        bindee: webview.currentWebview
+        bindee: containerWebView.currentWebview
         actionsContext: actionManager.globalContext
         model: UnityWebApps.UnityWebappsAppModel { searchPath: webappModelSearchPath }
         injectExtraUbuntuApis: runningLocalApplication

=== added directory 'src/app/webcontainer/assets'
=== added file 'src/app/webcontainer/assets/[e-mail]'
Binary files src/app/webcontainer/assets/[e-mail]	1970-01-01 00:00:00 +0000 and src/app/webcontainer/assets/[e-mail]	2015-09-29 20:15:01 +0000 differ
=== modified file 'tests/autopilot/webapp_container/tests/__init__.py'
--- tests/autopilot/webapp_container/tests/__init__.py	2015-07-28 19:29:58 +0000
+++ tests/autopilot/webapp_container/tests/__init__.py	2015-09-29 20:15:01 +0000
@@ -16,7 +16,9 @@
 """ Autopilot tests for the webapp_container package """
 
 import os
+import signal
 import subprocess
+import psutil
 
 import fixtures
 from autopilot.testcase import AutopilotTestCase
@@ -120,6 +122,15 @@
         webview.url = url
         self.assert_page_eventually_loaded(url)
 
+    def kill_web_processes(self, signal=signal.SIGKILL):
+        children = psutil.Process(self.app.pid).children(True)
+        for child in children:
+            if child.name() == 'oxide-renderer':
+                for arg in child.cmdline():
+                    if '--type=renderer' in arg:
+                        os.kill(child.pid, signal)
+                        break
+
 
 class WebappContainerTestCaseWithLocalContentBase(WebappContainerTestCaseBase):
     BASE_URL_SCHEME = 'http://'

=== added file 'tests/autopilot/webapp_container/tests/test_sad_tab.py'
--- tests/autopilot/webapp_container/tests/test_sad_tab.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/webapp_container/tests/test_sad_tab.py	2015-09-29 20:15:01 +0000
@@ -0,0 +1,162 @@
+# -*- 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/>.
+
+import signal
+import time
+
+from webapp_container.tests import WebappContainerTestCaseWithLocalContentBase
+
+from testtools.matchers import Equals, Contains, GreaterThan
+from autopilot.matchers import Eventually
+
+import ubuntuuitoolkit as uitk
+
+
+class SadPage(uitk.UbuntuUIToolkitCustomProxyObjectBase):
+    def click_reload_button(self):
+        button = self.select_single("Button", objectName="reloadButton")
+        self.pointing_device.click_object(button)
+
+
+class TestSadTab(WebappContainerTestCaseWithLocalContentBase):
+    def _kill_web_process(self):
+        self.kill_web_processes()
+        time.sleep(1)
+        self.assert_page_eventually_loaded(self.url)
+
+        self.kill_web_processes()
+
+    def _click_href_target_blank(self):
+        webview = self.get_oxide_webview()
+        self.assertThat(webview.url, Contains('/open-close-content'))
+        gr = webview.globalRect
+        self.pointing_device.move(
+            gr.x + gr.width/4,
+            gr.y + gr.height/4)
+        self.pointing_device.click()
+
+    def _click_overlay(self):
+        popup_controller = self.get_popup_controller()
+        new_view_watcher = popup_controller.watch_signal(
+            'newViewCreated(QString)')
+        animation_watcher = popup_controller.watch_signal(
+            'windowOverlayOpenAnimationDone()')
+        animation_signal_emission = animation_watcher.num_emissions
+
+        views = self.get_popup_overlay_views()
+        self.assertThat(len(views), Equals(0))
+
+        self._click_href_target_blank()
+
+        self.assertThat(
+            lambda: new_view_watcher.was_emitted,
+            Eventually(Equals(True)))
+        self.assertThat(
+            lambda: len(self.get_popup_overlay_views()),
+            Eventually(Equals(1)))
+        views = self.get_popup_overlay_views()
+        overlay = views[0]
+        self.assertThat(
+            overlay.select_single(objectName="overlayWebview").url,
+            Contains('/open-close-content'))
+
+        self.assertThat(
+            lambda: animation_watcher.num_emissions,
+            Eventually(GreaterThan(animation_signal_emission)))
+
+    def test_reload_main_webview_killed(self):
+        self.launch_webcontainer_app_with_local_http_server([])
+        self.get_webcontainer_window().visible.wait_for(True)
+
+        self._kill_web_process()
+
+        sad_webview = self.app.wait_select_single(
+            SadPage,
+            objectName="mainWebviewSadPage")
+        sad_webview.click_reload_button()
+        sad_webview.wait_until_destroyed()
+
+        self.assert_page_eventually_loaded(self.url)
+
+    def test_reload_overlay_killed(self):
+        args = []
+        self.launch_webcontainer_app_with_local_http_server(
+            args,
+            '/open-close-content')
+        self.get_webcontainer_window().visible.wait_for(True)
+
+        self._click_overlay()
+
+        self._kill_web_process()
+
+        sad_webview = self.app.wait_select_single(
+            SadPage,
+            objectName="overlaySadPage")
+
+        sad_webview.click_reload_button()
+        sad_webview.wait_until_destroyed()
+
+        views = self.get_popup_overlay_views()
+        overlay = views[0]
+        self.assertThat(
+            lambda: overlay.wait_select_single(
+                objectName="overlayWebview").url,
+            Eventually(Contains('/open-close-content')))
+
+    def _crash_web_process(self):
+        self.kill_web_processes(signal.SIGABRT)
+
+    def test_reload_main_webview_crashed(self):
+        self.launch_webcontainer_app_with_local_http_server([])
+        self.get_webcontainer_window().visible.wait_for(True)
+
+        self._crash_web_process()
+
+        sad_webview = self.app.wait_select_single(
+            SadPage,
+            objectName="mainWebviewSadPage")
+
+        sad_webview.click_reload_button()
+        sad_webview.wait_until_destroyed()
+
+        self.assert_page_eventually_loaded(self.url)
+
+    def test_reload_overlay_crashed(self):
+        args = []
+        self.launch_webcontainer_app_with_local_http_server(
+            args,
+            '/open-close-content')
+        self.get_webcontainer_window().visible.wait_for(True)
+
+        self._click_overlay()
+        self.assertThat(
+            lambda: len(self.get_popup_overlay_views()),
+            Eventually(Equals(1)))
+
+        self._crash_web_process()
+
+        sad_webview = self.app.wait_select_single(
+            SadPage,
+            objectName="overlaySadPage")
+
+        sad_webview.click_reload_button()
+        sad_webview.wait_until_destroyed()
+
+        views = self.get_popup_overlay_views()
+        overlay = views[0]
+        self.assertThat(
+            lambda: overlay.wait_select_single(
+                objectName="overlayWebview").url,
+            Eventually(Contains('/open-close-content')))