Changeset 225946 in webkit

Timestamp:

Dec 14, 2017, 5:01:47 PM (9 years ago)

Author:

Simon Fraser

Message:

Fix Windows build after r225915.

Windows doens't have dispatch_once with blocks. Switch to use lambda functions instead.

• platform/graphics/cg/GraphicsContextCG.cpp:

(WebCore::sRGBColorSpaceRef):
(WebCore::linearRGBColorSpaceRef):
(WebCore::extendedSRGBColorSpaceRef):
(WebCore::displayP3ColorSpaceRef):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/GraphicsContextCG.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-14  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix Windows build after r225915.
+
+        Windows doens't have dispatch_once with blocks. Switch to use lambda functions instead.
+
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::sRGBColorSpaceRef):
+        (WebCore::linearRGBColorSpaceRef):
+        (WebCore::extendedSRGBColorSpaceRef):
+        (WebCore::displayP3ColorSpaceRef):
+
 2017-12-14  Devin Rousso  <webkit@devinrousso.com>
 

trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

@@ -75 +75 @@
 CGColorSpaceRef sRGBColorSpaceRef()
 {
-    static CGColorSpaceRef sRGBColorSpace;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        sRGBColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
+    auto createColorSpace = []() {
 #if PLATFORM(WIN)
         // Out-of-date CG installations will not honor kCGColorSpaceSRGB. This logic avoids
@@ -84 +81 @@
         // is sRGB, this all works out nicely.
         // FIXME: Is this still needed? rdar://problem/15213515 was fixed.
-        if (!sRGBColorSpace)
-            sRGBColorSpace = CGColorSpaceCreateDeviceRGB();
+        CGColorSpaceRef colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
+        if (!colorSpace)
+            colorSpace = CGColorSpaceCreateDeviceRGB();
+        return colorSpace;
+#else
+        return CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
 #endif // PLATFORM(WIN)
-    });
+    };
+
+    static CGColorSpaceRef sRGBColorSpace = createColorSpace();
     return sRGBColorSpace;
 }
@@ -95 +98 @@
 CGColorSpaceRef linearRGBColorSpaceRef()
 {
-    static CGColorSpaceRef linearRGBColorSpace;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
+    auto createColorSpace = []() {
 #if PLATFORM(WIN)
         // FIXME: Windows should be able to use linear sRGB, this is tracked by http://webkit.org/b/80000.
-        linearRGBColorSpace = sRGBColorSpaceRef();
+        return sRGBColorSpaceRef();
 #else
-        linearRGBColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceLinearSRGB);
+        return CGColorSpaceCreateWithName(kCGColorSpaceLinearSRGB);
 #endif
-    });
-
+    };
+        
+    static CGColorSpaceRef linearRGBColorSpace = createColorSpace();
     return linearRGBColorSpace;
 }
@@ -112 +114 @@
 CGColorSpaceRef extendedSRGBColorSpaceRef()
 {
-    static CGColorSpaceRef extendedSRGBColorSpace;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
+    auto createColorSpace = []() {
 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
-        extendedSRGBColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB);
+        CGColorSpaceRef colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB);
 #endif
         // If there is no support for extended sRGB, fall back to sRGB.
-        if (!extendedSRGBColorSpace)
-            extendedSRGBColorSpace = sRGBColorSpaceRef();
-    });
+        if (!colorSpace)
+            colorSpace = sRGBColorSpaceRef();
+        
+        return colorSpace;
+    };
+        
+    static CGColorSpaceRef extendedSRGBColorSpace = createColorSpace();
     return extendedSRGBColorSpace;
 }
@@ -127 +131 @@
 CGColorSpaceRef displayP3ColorSpaceRef()
 {
-    static CGColorSpaceRef displayP3ColorSpace;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
+    auto createColorSpace = []() {
 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101100)
-        displayP3ColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceDisplayP3);
+        return CGColorSpaceCreateWithName(kCGColorSpaceDisplayP3);
 #else
-        displayP3ColorSpace = sRGBColorSpaceRef();
+        return sRGBColorSpaceRef();
 #endif
-    });
+    };
+
+    static CGColorSpaceRef displayP3ColorSpace = createColorSpace();
     return displayP3ColorSpace;
 }