Changeset 279905 in webkit

Timestamp:

Jul 13, 2021, 10:57:07 PM (4 years ago)

Author:

Jean-Yves Avenard

Message:

MediaSessionManagerCocoa::ensureCodecsRegistered() isn't thread-safe
​https://bugs.webkit.org/show_bug.cgi?id=227940

Reviewed by Maciej Stachowiak.

C++11 static initializers aren't thread-safe due to architectural and compilation
option choices. So we use Grand Central Dispatch's dispatch_once instead.

• platform/audio/cocoa/MediaSessionManagerCocoa.mm:

(WebCore::MediaSessionManagerCocoa::ensureCodecsRegistered):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/cocoa/MediaSessionManagerCocoa.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-07-13  Jean-Yves Avenard  <jya@apple.com>
+
+        MediaSessionManagerCocoa::ensureCodecsRegistered() isn't thread-safe
+        https://bugs.webkit.org/show_bug.cgi?id=227940
+
+        Reviewed by Maciej Stachowiak.
+
+        C++11 static initializers aren't thread-safe due to architectural and compilation
+        option choices. So we use Grand Central Dispatch's dispatch_once instead.
+
+        * platform/audio/cocoa/MediaSessionManagerCocoa.mm:
+        (WebCore::MediaSessionManagerCocoa::ensureCodecsRegistered):
+
 2021-07-13  Jean-Yves Avenard  <jya@apple.com>
 

trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm

@@ -66 +66 @@
 void MediaSessionManagerCocoa::ensureCodecsRegistered()
 {
-    static bool sInitDone = []() {
 #if ENABLE(VP9)
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
         if (shouldEnableVP9Decoder())
             registerSupplementalVP9Decoder();
@@ -74 +75 @@
         if (shouldEnableVP9SWDecoder())
             registerWebKitVP9Decoder();
+    });
 #endif
-        return true;
-    }();
-    UNUSED_VARIABLE(sInitDone);
 }