Changeset 207251 in webkit

Timestamp:

Oct 12, 2016 4:01:48 PM (8 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r203903. rdar://problem/28476961

Location:

branches/safari-602.2.14.0-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/PlatformScreenMac.mm (modified) (1 diff)

branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-12  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r203903. rdar://problem/28476961
+
+    2016-07-28  Dean Jackson  <dino@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_hanson@apple.com>
 

branches/safari-602.2.14.0-branch/Source/WebCore/platform/mac/PlatformScreenMac.mm

@@ -144 +144 @@
         return false;
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+    return [screen(widget) canRepresentDisplayGamut:NSDisplayGamutP3];
+#else
     auto colorSpace = screen(widget).colorSpace.CGColorSpace;
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
-    return CGColorSpaceIsWideGamutRGB(colorSpace);
-#else
     auto iccData = adoptCF(CGColorSpaceCopyICCProfile(colorSpace));
     auto profile = adoptCF(ColorSyncProfileCreate(iccData.get(), nullptr));