Changeset 207366 in webkit

Timestamp:

Oct 14, 2016 5:37:45 PM (8 years ago)

Author:

dino@apple.com

Message:

Add Display P3 ColorSpace
​https://bugs.webkit.org/show_bug.cgi?id=162880
<rdar://problem/28598564>

Reviewed by Sam Weinig.

Add a new ColorSpace for Display P3.

This will be tested once the Color class can create
objects that reference other color spaces.

• platform/graphics/ColorSpace.h:
• platform/graphics/cg/GraphicsContextCG.cpp:

(WebCore::displayP3ColorSpaceRef):

• platform/graphics/cg/GraphicsContextCG.h:

(WebCore::cachedCGColorSpace):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ColorSpace.h (modified) (1 diff)
• platform/graphics/cg/GraphicsContextCG.cpp (modified) (1 diff)
• platform/graphics/cg/GraphicsContextCG.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-14  Dean Jackson  <dino@apple.com>
+
+        Add Display P3 ColorSpace
+        https://bugs.webkit.org/show_bug.cgi?id=162880
+        <rdar://problem/28598564>
+
+        Reviewed by Sam Weinig.
+
+        Re-landing with a version that hopefully compiles on El Capitan.
+
+        Add a new ColorSpace for Display P3.
+
+        This will be tested once the Color class can create
+        objects that reference other color spaces.
+
+        * platform/graphics/ColorSpace.h:
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::displayP3ColorSpaceRef):
+        * platform/graphics/cg/GraphicsContextCG.h:
+        (WebCore::cachedCGColorSpace):
+
 2016-10-14  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/platform/graphics/ColorSpace.h

@@ -32 +32 @@
     ColorSpaceDeviceRGB,
     ColorSpaceSRGB,
-    ColorSpaceLinearRGB
+    ColorSpaceLinearRGB,
+    ColorSpaceDisplayP3
 };
     

trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

@@ -93 +93 @@
 #endif // PLATFORM(WIN)
     return sRGBSpace;
+}
+
+CGColorSpaceRef displayP3ColorSpaceRef()
+{
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101100)
+    static CGColorSpaceRef displayP3Space = CGColorSpaceCreateWithName(kCGColorSpaceDisplayP3);
+#else
+    static CGColorSpaceRef displayP3Space = sRGBColorSpaceRef();
+#endif
+    return displayP3Space;
 }
 

trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.h

@@ -35 +35 @@
 CGColorSpaceRef deviceRGBColorSpaceRef();
 WEBCORE_EXPORT CGColorSpaceRef sRGBColorSpaceRef();
+WEBCORE_EXPORT CGColorSpaceRef displayP3ColorSpaceRef();
 CGColorSpaceRef linearRGBColorSpaceRef();
 
@@ -51 +52 @@
     case ColorSpaceLinearRGB:
         return linearRGBColorSpaceRef();
+    case ColorSpaceDisplayP3:
+        return displayP3ColorSpaceRef();
     }
     ASSERT_NOT_REACHED();