diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index f534f7888e98..f7ec3a8b98c7 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,17 @@ +2016-10-05 Commit Queue + + 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 Reuse CodeGenerator::UpdateFile in Tools CodeGenerator diff --git a/Source/WebCore/platform/graphics/ColorSpace.h b/Source/WebCore/platform/graphics/ColorSpace.h index e12c40adca1e..7622c47b206e 100644 --- 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 index 46562b2d8cab..4b7e1b4df3bf 100644 --- 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 index e6f15260843b..4b88016757d1 100644 --- 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();