Changeset 271887 in webkit

Timestamp:

Jan 26, 2021, 10:52:40 AM (4 years ago)

Author:

achristensen@apple.com

Message:

Revert part of r271493
​https://bugs.webkit.org/show_bug.cgi?id=220066
<rdar://problem/73615999>

We have an internal app that calls registerSchemeForCustomProtocol on a non-main thread before WebKit initializes.
While this is a problem, we have to not crash on launch until they fix this.

• UIProcess/API/Cocoa/WKBrowsingContextController.mm:

(+[WKBrowsingContextController registerSchemeForCustomProtocol:]):
(+[WKBrowsingContextController unregisterSchemeForCustomProtocol:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKBrowsingContextController.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-26  Alex Christensen  <achristensen@webkit.org>
+
+        Revert part of r271493
+        https://bugs.webkit.org/show_bug.cgi?id=220066
+        <rdar://problem/73615999>
+
+        We have an internal app that calls registerSchemeForCustomProtocol on a non-main thread before WebKit initializes.
+        While this is a problem, we have to not crash on launch until they fix this.
+
+        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+        (+[WKBrowsingContextController registerSchemeForCustomProtocol:]):
+        (+[WKBrowsingContextController unregisterSchemeForCustomProtocol:]):
+
 2021-01-26  Per Arne  <pvollan@apple.com>
 

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

@@ -106 +106 @@
         WebKit::WebProcessPool::registerGlobalURLSchemeAsHavingCustomProtocolHandlers(scheme);
     else {
-        RunLoop::main().dispatch([scheme = retainPtr(scheme)] {
+        // This cannot be RunLoop::main().dispatch because it is called before the main runloop is initialized.  See rdar://problem/73615999
+        dispatch_async(dispatch_get_main_queue(), makeBlockPtr([scheme = retainPtr(scheme)] {
             WebKit::WebProcessPool::registerGlobalURLSchemeAsHavingCustomProtocolHandlers(scheme.get());
-        });
+        }).get());
     }
 }
@@ -117 +118 @@
         WebKit::WebProcessPool::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(scheme);
     else {
-        RunLoop::main().dispatch([scheme = retainPtr(scheme)] {
+        // This cannot be RunLoop::main().dispatch because it is called before the main runloop is initialized.  See rdar://problem/73615999
+        dispatch_async(dispatch_get_main_queue(), makeBlockPtr([scheme = retainPtr(scheme)] {
             WebKit::WebProcessPool::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(scheme.get());
-        });
+        }).get());
     }
 }