Bug 1194726 - Blank Tabs Fix Attempt

Added check for WKErrorCode.WebContentProcessTerminated with logging and reload.
mozilla-mobile · Aug 21, 2015 · 6276c1e · 6276c1e
1 parent 3bcdb28
commit 6276c1e
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/Client/Frontend/Browser/BrowserViewController.swift b/Client/Frontend/Browser/BrowserViewController.swift
@@ -1520,6 +1520,10 @@ extension BrowserViewController: WKUIDelegate {
             return
         }
 
+        if checkIfWebContentProcessHasCrashed(webView, error: error) {
+            return
+        }
+
         if let url = error.userInfo?["NSErrorFailingURLKey"] as? NSURL {
             ErrorPageHelper().showPage(error, forUrl: url, inWebView: webView)
         }
@@ -1535,6 +1539,10 @@ extension BrowserViewController: WKUIDelegate {
             return
         }
 
+        if checkIfWebContentProcessHasCrashed(webView, error: error) {
+            return
+        }
+
         if error.code == Int(CFNetworkErrors.CFURLErrorCancelled.rawValue) {
             if let browser = tabManager[webView] where browser === tabManager.selectedTab {
                 urlBar.currentURL = browser.displayURL
@@ -1547,6 +1555,16 @@ extension BrowserViewController: WKUIDelegate {
         }
     }
 
+    private func checkIfWebContentProcessHasCrashed(webView: WKWebView, error: NSError) -> Bool {
+        if error.code == WKErrorCode.WebContentProcessTerminated.rawValue && error.domain == "WebKitErrorDomain" {
+            log.debug("WebContent process has crashed. Trying to reloadFromOrigin to restart it.")
+            webView.reloadFromOrigin()
+            return true
+        }
+
+        return false
+    }
+
     func webView(webView: WKWebView, decidePolicyForNavigationResponse navigationResponse: WKNavigationResponse, decisionHandler: (WKNavigationResponsePolicy) -> Void) {
         if navigationResponse.canShowMIMEType {
             decisionHandler(WKNavigationResponsePolicy.Allow)