Changeset 197699 in webkit

Timestamp:

Mar 7, 2016, 12:33:22 PM (9 years ago)

Author:

Simon Fraser

Message:

Use CGColorSpaceCopyICCData instead of CGColorSpaceCopyICCProfile
​https://bugs.webkit.org/show_bug.cgi?id=155123
rdar://problem/24990256

Reviewed by Tim Horton.

On newer OSes, use CGColorSpaceCopyICCData().

• Shared/mac/ColorSpaceData.mm:

(WebKit::ColorSpaceData::encode):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/mac/ColorSpaceData.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-03-07  Simon Fraser  <simon.fraser@apple.com>
+
+        Use CGColorSpaceCopyICCData instead of CGColorSpaceCopyICCProfile
+        https://bugs.webkit.org/show_bug.cgi?id=155123
+        rdar://problem/24990256
+
+        Reviewed by Tim Horton.
+        
+        On newer OSes, use CGColorSpaceCopyICCData().
+
+        * Shared/mac/ColorSpaceData.mm:
+        (WebKit::ColorSpaceData::encode):
+
 2016-03-07  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/WebKit2/Shared/mac/ColorSpaceData.mm

@@ -51 +51 @@
 
         // Failing that, just encode the ICC data.
-        if (RetainPtr<CFDataRef> profileData = adoptCF(CGColorSpaceCopyICCProfile(cgColorSpace.get()))) {
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+        RetainPtr<CFDataRef> profileData = adoptCF(CGColorSpaceCopyICCData(cgColorSpace.get()));
+#else
+        RetainPtr<CFDataRef> profileData = adoptCF(CGColorSpaceCopyICCProfile(cgColorSpace.get()));
+#endif
+        if (profileData) {
             encoder.encodeEnum(Data);
             IPC::encode(encoder, profileData.get());