Changeset 263278 in webkit

Timestamp:

Jun 19, 2020, 11:43:38 AM (6 years ago)

Author:

Chris Dumez

Message:

[iOS] Drop std::call_once() from RenderThemeIOS::cssValueToSystemColorMap()
​https://bugs.webkit.org/show_bug.cgi?id=213392

Reviewed by Geoffrey Garen.

Drop std::call_once() from RenderThemeIOS::cssValueToSystemColorMap() since this function
is always called from the main thread.

• rendering/RenderThemeIOS.mm:

(WebCore::RenderThemeIOS::cssValueToSystemColorMap):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderThemeIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-06-19  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Drop std::call_once() from RenderThemeIOS::cssValueToSystemColorMap()
+        https://bugs.webkit.org/show_bug.cgi?id=213392
+
+        Reviewed by Geoffrey Garen.
+
+        Drop std::call_once() from RenderThemeIOS::cssValueToSystemColorMap() since this function
+        is always called from the main thread.
+
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::RenderThemeIOS::cssValueToSystemColorMap):
+
 2020-06-19  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/rendering/RenderThemeIOS.mm

@@ -1312 +1312 @@
 const RenderThemeIOS::CSSValueToSystemColorMap& RenderThemeIOS::cssValueToSystemColorMap()
 {
-    static NeverDestroyed<CSSValueToSystemColorMap> map;
-
-    static std::once_flag onceFlag;
-    std::call_once(
-        onceFlag,
-        [] {
+    ASSERT(RunLoop::isMain());
+    static const NeverDestroyed<CSSValueToSystemColorMap> colorMap = [] {
+        CSSValueToSystemColorMap map;
         for (auto& cssValueIDSelector : cssValueIDSelectorList()) {
             for (bool useDarkAppearance : { false, true }) {
                 for (bool useElevatedUserInterfaceLevel : { false, true }) {
                     if (auto color = systemColorFromCSSValueID(cssValueIDSelector.cssValueID, useDarkAppearance, useElevatedUserInterfaceLevel))
-                        map.get().add(CSSValueKey { cssValueIDSelector.cssValueID, useDarkAppearance, useElevatedUserInterfaceLevel }, *color);
+                        map.add(CSSValueKey { cssValueIDSelector.cssValueID, useDarkAppearance, useElevatedUserInterfaceLevel }, *color);
                 }
             }
         }
-    });
-
-    return map;
+        return map;
+    }();
+    return colorMap;
 }