Unreviewed, rolling out r206845.

https://bugs.webkit.org/show_bug.cgi?id=162998 broke el capitan build (Requested by alexchristensen on #webkit). Reverted changeset: "Add Display P3 ColorSpace" https://bugs.webkit.org/show_bug.cgi?id=162880 http://trac.webkit.org/changeset/206845 Canonical link: https://commits.webkit.org/180905@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@206852 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Oct 6, 2016 · 0d0e2e0 · 0d0e2e0
1 parent 193110d
commit 0d0e2e0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2016-10-05  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r206845.
+        https://bugs.webkit.org/show_bug.cgi?id=162998
+
+        broke el capitan build (Requested by alexchristensen on
+        #webkit).
+
+        Reverted changeset:
+
+        "Add Display P3 ColorSpace"
+        https://bugs.webkit.org/show_bug.cgi?id=162880
+        http://trac.webkit.org/changeset/206845
+
 2016-10-05  Youenn Fablet  <youenn@apple.com>
 
         Reuse CodeGenerator::UpdateFile in Tools CodeGenerator

diff --git a/Source/WebCore/platform/graphics/ColorSpace.h b/Source/WebCore/platform/graphics/ColorSpace.h
@@ -31,8 +31,7 @@ namespace WebCore {
 enum ColorSpace {
     ColorSpaceDeviceRGB,
     ColorSpaceSRGB,
-    ColorSpaceLinearRGB,
-    ColorSpaceDisplayP3
+    ColorSpaceLinearRGB
 };
 
 } // namespace WebCore

diff --git a/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp b/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
@@ -94,16 +94,6 @@ CGColorSpaceRef sRGBColorSpaceRef()
     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;
-}
-
 #if PLATFORM(WIN)
 CGColorSpaceRef linearRGBColorSpaceRef()
 {

diff --git a/Source/WebCore/platform/graphics/cg/GraphicsContextCG.h b/Source/WebCore/platform/graphics/cg/GraphicsContextCG.h
@@ -34,7 +34,6 @@ namespace WebCore {
 
 CGColorSpaceRef deviceRGBColorSpaceRef();
 WEBCORE_EXPORT CGColorSpaceRef sRGBColorSpaceRef();
-WEBCORE_EXPORT CGColorSpaceRef displayP3ColorSpaceRef();
 CGColorSpaceRef linearRGBColorSpaceRef();
 
 inline CGAffineTransform getUserToBaseCTM(CGContextRef context)
@@ -51,8 +50,6 @@ static inline CGColorSpaceRef cachedCGColorSpace(ColorSpace colorSpace)
         return sRGBColorSpaceRef();
     case ColorSpaceLinearRGB:
         return linearRGBColorSpaceRef();
-    case ColorSpaceDisplayP3:
-        return displayP3ColorSpaceRef();
     }
     ASSERT_NOT_REACHED();
     return deviceRGBColorSpaceRef();