Changeset 256646 in webkit

Timestamp:

Feb 14, 2020 2:37:44 PM (4 years ago)

Author:

achristensen@apple.com

Message:

WKWebView._setResourceLoadDelegate should clear the WebPageProxy's ResourceLoadClient
​https://bugs.webkit.org/show_bug.cgi?id=205887

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _setResourceLoadDelegate:]):
WebPageProxy::setResourceLoadClient has some special logic to possibly clear a bit in the web process that will reduce IPCs.
This is a small oversight in my original implementation.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-02-14  Alex Christensen  <achristensen@webkit.org>
+
+        WKWebView._setResourceLoadDelegate should clear the WebPageProxy's ResourceLoadClient
+        https://bugs.webkit.org/show_bug.cgi?id=205887
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _setResourceLoadDelegate:]):
+        WebPageProxy::setResourceLoadClient has some special logic to possibly clear a bit in the web process that will reduce IPCs.
+        This is a small oversight in my original implementation.
+
 2020-02-14  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

@@ -685 +685 @@
 - (void)_setResourceLoadDelegate:(id<_WKResourceLoadDelegate>)delegate
 {
-    _page->setResourceLoadClient(_resourceLoadDelegate->createResourceLoadClient());
-    _resourceLoadDelegate->setDelegate(delegate);
+    if (delegate) {
+        _page->setResourceLoadClient(_resourceLoadDelegate->createResourceLoadClient());
+        _resourceLoadDelegate->setDelegate(delegate);
+    } else {
+        _page->setResourceLoadClient(nullptr);
+        _resourceLoadDelegate->setDelegate(nil);
+    }
 }