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): Canonical link: https://commits.webkit.org/173211@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@197699 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Mar 7, 2016 · 311c8cd · 311c8cd
1 parent 6119b2e
commit 311c8cd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+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>
 
         Last opened tab does not receive SetHiddenPageTimerThrottlingIncreaseLimit message

diff --git a/Source/WebKit2/Shared/mac/ColorSpaceData.mm b/Source/WebKit2/Shared/mac/ColorSpaceData.mm
@@ -50,7 +50,12 @@
         }
 
         // 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());
             return;