Title: [206852] trunk/Source/WebCore
Revision
206852
Author
commit-qu...@webkit.org
Date
2016-10-05 23:54:46 -0700 (Wed, 05 Oct 2016)

Log Message

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

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (206851 => 206852)


--- trunk/Source/WebCore/ChangeLog	2016-10-06 06:45:34 UTC (rev 206851)
+++ trunk/Source/WebCore/ChangeLog	2016-10-06 06:54:46 UTC (rev 206852)
@@ -1,3 +1,17 @@
+2016-10-05  Commit Queue  <commit-qu...@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  <you...@apple.com>
 
         Reuse CodeGenerator::UpdateFile in Tools CodeGenerator

Modified: trunk/Source/WebCore/platform/graphics/ColorSpace.h (206851 => 206852)


--- trunk/Source/WebCore/platform/graphics/ColorSpace.h	2016-10-06 06:45:34 UTC (rev 206851)
+++ trunk/Source/WebCore/platform/graphics/ColorSpace.h	2016-10-06 06:54:46 UTC (rev 206852)
@@ -31,8 +31,7 @@
 enum ColorSpace {
     ColorSpaceDeviceRGB,
     ColorSpaceSRGB,
-    ColorSpaceLinearRGB,
-    ColorSpaceDisplayP3
+    ColorSpaceLinearRGB
 };
     
 } // namespace WebCore

Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (206851 => 206852)


--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp	2016-10-06 06:45:34 UTC (rev 206851)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp	2016-10-06 06:54:46 UTC (rev 206852)
@@ -94,16 +94,6 @@
     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()
 {

Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.h (206851 => 206852)


--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.h	2016-10-06 06:45:34 UTC (rev 206851)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.h	2016-10-06 06:54:46 UTC (rev 206852)
@@ -34,7 +34,6 @@
 
 CGColorSpaceRef deviceRGBColorSpaceRef();
 WEBCORE_EXPORT CGColorSpaceRef sRGBColorSpaceRef();
-WEBCORE_EXPORT CGColorSpaceRef displayP3ColorSpaceRef();
 CGColorSpaceRef linearRGBColorSpaceRef();
 
 inline CGAffineTransform getUserToBaseCTM(CGContextRef context)
@@ -51,8 +50,6 @@
         return sRGBColorSpaceRef();
     case ColorSpaceLinearRGB:
         return linearRGBColorSpaceRef();
-    case ColorSpaceDisplayP3:
-        return displayP3ColorSpaceRef();
     }
     ASSERT_NOT_REACHED();
     return deviceRGBColorSpaceRef();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to