Title: [197699] trunk/Source/WebKit2
- Revision
- 197699
- Author
- [email protected]
- Date
- 2016-03-07 12:33:22 -0800 (Mon, 07 Mar 2016)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (197698 => 197699)
--- trunk/Source/WebKit2/ChangeLog 2016-03-07 20:28:30 UTC (rev 197698)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-07 20:33:22 UTC (rev 197699)
@@ -1,3 +1,16 @@
+2016-03-07 Simon Fraser <[email protected]>
+
+ 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 <[email protected]>
Last opened tab does not receive SetHiddenPageTimerThrottlingIncreaseLimit message
Modified: trunk/Source/WebKit2/Shared/mac/ColorSpaceData.mm (197698 => 197699)
--- trunk/Source/WebKit2/Shared/mac/ColorSpaceData.mm 2016-03-07 20:28:30 UTC (rev 197698)
+++ trunk/Source/WebKit2/Shared/mac/ColorSpaceData.mm 2016-03-07 20:33:22 UTC (rev 197699)
@@ -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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
