Merge pull request #29371 from brave/pr29368_ios-web-process-crash-fix_1.80.x

[iOS] Handle web process terminating when using Chromium web views (uplift to 1.80.x)

Author: kjozwiak

ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+TabObserver.swift

@@ -328,6 +328,16 @@ extension BrowserViewController: TabObserver {
     }
   }
 
+  public func tabRenderProcessDidTerminate(_ tab: some TabState) {
+    guard let url = tab.lastCommittedURL else { return }
+    if InternalURL.isValid(url: url) {
+      // No need to refresh an internal url
+      return
+    }
+    // For now just reload the page when the process crashes
+    tab.reload()
+  }
+
   public func tabDidUpdateURL(_ tab: some TabState) {
     if tab.isDisplayingBasicAuthPrompt == true {
       tab.setVirtualURL(

ios/brave-ios/Sources/Web/Chromium/TabCWVNavigationHandler.swift

@@ -145,6 +145,10 @@ class TabCWVNavigationHandler: NSObject, BraveWebViewNavigationDelegate {
     tab.didFailNavigation(with: error)
   }
 
+  func webViewWebContentProcessDidTerminate(_ webView: CWVWebView) {
+    tab?.renderProcessTerminated()
+  }
+
   public func webView(_ webView: CWVWebView, didRequestDownloadWith task: CWVDownloadTask) {
     guard let tab else { return }
     let pendingDownload = ChromiumDownload(

ios/brave-ios/Sources/Web/TabObserver.swift

@@ -17,6 +17,7 @@ public protocol TabObserver: AnyObject {
   func tabDidRedirectNavigation(_ tab: some TabState)
   func tabDidFinishNavigation(_ tab: some TabState)
   func tab(_ tab: some TabState, didFailNavigationWithError error: Error)
+  func tabRenderProcessDidTerminate(_ tab: some TabState)
 
   func tabDidUpdateURL(_ tab: some TabState)
   func tabDidChangeTitle(_ tab: some TabState)
@@ -47,6 +48,7 @@ extension TabObserver {
   public func tabDidRedirectNavigation(_ tab: some TabState) {}
   public func tabDidFinishNavigation(_ tab: some TabState) {}
   public func tab(_ tab: some TabState, didFailNavigationWithError error: Error) {}
+  public func tabRenderProcessDidTerminate(_ tab: some TabState) {}
 
   public func tabDidUpdateURL(_ tab: some TabState) {}
   public func tabDidChangeTitle(_ tab: some TabState) {}
@@ -75,6 +77,7 @@ class AnyTabObserver: TabObserver, Hashable, CustomDebugStringConvertible {
   private let _tabDidRedirectNavigation: (any TabState) -> Void
   private let _tabDidFinishNavigation: (any TabState) -> Void
   private let _tabDidFailNavigationWithError: (any TabState, Error) -> Void
+  private let _tabRenderProcessDidTerminate: (any TabState) -> Void
 
   private let _tabDidUpdateURL: (any TabState) -> Void
   private let _tabDidChangeTitle: (any TabState) -> Void
@@ -118,6 +121,8 @@ class AnyTabObserver: TabObserver, Hashable, CustomDebugStringConvertible {
     _tabDidFailNavigationWithError = { [weak observer] in
       observer?.tab($0, didFailNavigationWithError: $1)
     }
+    _tabRenderProcessDidTerminate = { [weak observer] in observer?.tabRenderProcessDidTerminate($0)
+    }
     _tabDidUpdateURL = { [weak observer] in observer?.tabDidUpdateURL($0) }
     _tabDidChangeTitle = { [weak observer] in observer?.tabDidChangeTitle($0) }
     _tabDidStartLoading = { [weak observer] in observer?.tabDidStartLoading($0) }
@@ -161,6 +166,9 @@ class AnyTabObserver: TabObserver, Hashable, CustomDebugStringConvertible {
   func tab(_ tab: some TabState, didFailNavigationWithError error: Error) {
     _tabDidFailNavigationWithError(tab, error)
   }
+  func tabRenderProcessDidTerminate(_ tab: some TabState) {
+    _tabRenderProcessDidTerminate(tab)
+  }
   func tabDidUpdateURL(_ tab: some TabState) {
     _tabDidUpdateURL(tab)
   }

ios/brave-ios/Sources/Web/TabStateImpl.swift

@@ -147,4 +147,10 @@ extension TabStateImpl {
       $0.tab(self, didFailNavigationWithError: error)
     }
   }
+
+  func renderProcessTerminated() {
+    observers.forEach {
+      $0.tabRenderProcessDidTerminate(self)
+    }
+  }
 }

ios/brave-ios/Sources/Web/WebKit/TabWKNavigationHandler.swift

@@ -326,6 +326,10 @@ class TabWKNavigationHandler: NSObject, WKNavigationDelegate {
     tab?.didFinishNavigation()
   }
 
+  func webViewWebContentProcessDidTerminate(_ webView: WKWebView) {
+    tab?.renderProcessTerminated()
+  }
+
   func webView(
     _ webView: WKWebView,
     didReceiveServerRedirectForProvisionalNavigation navigation: WKNavigation!
@@ -352,11 +356,6 @@ class TabWKNavigationHandler: NSObject, WKNavigationDelegate {
         // original web page in the tab instead of replacing it with an error page.
         return
       }
-      if error.code == WKError.webContentProcessTerminated.rawValue {
-        Logger.module.warning("WebContent process has crashed. Trying to reload to restart it.")
-        tab.reload()
-        return
-      }
     }
 
     if let sslPinningError = sslPinningError {