Title: [207198] branches/safari-602-branch/Source/WebCore
Revision
207198
Author
matthew_han...@apple.com
Date
2016-10-12 01:41:06 -0700 (Wed, 12 Oct 2016)

Log Message

Merge r203903. rdar://problem/28476961

Modified Paths

Diff

Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207197 => 207198)


--- branches/safari-602-branch/Source/WebCore/ChangeLog	2016-10-12 08:41:03 UTC (rev 207197)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog	2016-10-12 08:41:06 UTC (rev 207198)
@@ -1,3 +1,28 @@
+2016-10-12  Matthew Hanson  <matthew_han...@apple.com>
+
+        Merge r203903. rdar://problem/28476961
+
+    2016-07-28  Dean Jackson  <d...@apple.com>
+
+            color-gamut media query returns incorrect results
+            https://bugs.webkit.org/show_bug.cgi?id=160166
+            <rdar://problem/27537577>
+
+            Reviewed by Darin Adler.
+
+            While I was unable to reproduce the originator's issue,
+            we communicated via email and it might have been related
+            to a customized color space calibration on an external
+            display.
+
+            Anyway, I took this opportunity to update to use the
+            more appropriate API for detection on macOS Sierra.
+
+            Covered by the existing fast/media/mq-color-gamut.html test.
+
+            * platform/mac/PlatformScreenMac.mm:
+            (WebCore::screenSupportsExtendedColor): Use NSScreen canRepresentDisplayGamut.
+
 2016-10-11  Matthew Hanson  <matthew_han...@apple.com>
 
         Merge r203792. rdar://problem/28476951

Modified: branches/safari-602-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm (207197 => 207198)


--- branches/safari-602-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm	2016-10-12 08:41:03 UTC (rev 207197)
+++ branches/safari-602-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm	2016-10-12 08:41:06 UTC (rev 207198)
@@ -143,11 +143,10 @@
     if (!widget)
         return false;
 
-    auto colorSpace = screen(widget).colorSpace.CGColorSpace;
-
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
-    return CGColorSpaceIsWideGamutRGB(colorSpace);
+    return [screen(widget) canRepresentDisplayGamut:NSDisplayGamutP3];
 #else
+    auto colorSpace = screen(widget).colorSpace.CGColorSpace;
     auto iccData = adoptCF(CGColorSpaceCopyICCProfile(colorSpace));
     auto profile = "" nullptr));
     return profile && ColorSyncProfileIsWideGamut(profile.get());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to