Changeset 261206 in webkit

Timestamp:

May 5, 2020 4:52:48 PM (4 years ago)

Author:

Chris Dumez

Message:

Crash under _LSSetApplicationInformationItem()
​https://bugs.webkit.org/show_bug.cgi?id=211478
<rdar://problem/62201314>

Reviewed by Alex Christensen.

Given the crashes, I suspect it is not actually safe to call _LSSetApplicationInformationItem()
from a non main-thread like it was done in r238289. We still run the code asynchronously to
address the issue that r238289 was trying to fix but we now call _LSSetApplicationInformationItem()
on the main thread.

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::updateProcessName):
(WebKit::WebProcess::updateActivePages):
(WebKit::setProcessNameQueue): Deleted.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-05  Chris Dumez  <cdumez@apple.com>
+
+        Crash under _LSSetApplicationInformationItem()
+        https://bugs.webkit.org/show_bug.cgi?id=211478
+        <rdar://problem/62201314>
+
+        Reviewed by Alex Christensen.
+
+        Given the crashes, I suspect it is not actually safe to call _LSSetApplicationInformationItem()
+        from a non main-thread like it was done in r238289. We still run the code asynchronously to
+        address the issue that r238289 was trying to fix but we now call _LSSetApplicationInformationItem()
+        on the main thread.
+
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::updateProcessName):
+        (WebKit::WebProcess::updateActivePages):
+        (WebKit::setProcessNameQueue): Deleted.
+
 2020-05-05  Peng Liu  <peng.liu6@apple.com>
 

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -381 +381 @@
 }
 
-#if PLATFORM(MAC)
-static WorkQueue& setProcessNameQueue()
-{
-    static NeverDestroyed<Ref<WorkQueue>> queue(WorkQueue::create("setProcessNameQueue"));
-    return queue.get().get();
-}
-#endif
-
 void WebProcess::updateProcessName()
 {
@@ -411 +403 @@
     }
 
-    setProcessNameQueue().dispatch([this, applicationName = WTFMove(applicationName)] {
+    RunLoop::main().dispatch([this, applicationName = WTFMove(applicationName)] {
         // Note that it is important for _RegisterApplication() to have been called before setting the display name.
         auto error = _LSSetApplicationInformationItem(kLSDefaultSessionID, _LSGetCurrentApplicationASN(), _kLSDisplayNameKey, (CFStringRef)applicationName.get(), nullptr);
@@ -679 +671 @@
 #if PLATFORM(MAC)
     if (!overrideDisplayName) {
-        setProcessNameQueue().dispatch([activeOrigins = activePagesOrigins(m_pageMap)] {
+        RunLoop::main().dispatch([activeOrigins = activePagesOrigins(m_pageMap)] {
             _LSSetApplicationInformationItem(kLSDefaultSessionID, _LSGetCurrentApplicationASN(), CFSTR("LSActivePageUserVisibleOriginsKey"), (__bridge CFArrayRef)activeOrigins.get(), nullptr);
         });
     } else {
-        setProcessNameQueue().dispatch([name = overrideDisplayName.createCFString()] {
+        RunLoop::main().dispatch([name = overrideDisplayName.createCFString()] {
             _LSSetApplicationInformationItem(kLSDefaultSessionID, _LSGetCurrentApplicationASN(), _kLSDisplayNameKey, name.get(), nullptr);
         });