Title: [186940] branches/safari-601.1-branch/Source/WebCore
- Revision
- 186940
- Author
- matthew_han...@apple.com
- Date
- 2015-07-16 22:33:08 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186879. rdar://problem/21758704
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186939 => 186940)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:33:05 UTC (rev 186939)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:33:08 UTC (rev 186940)
@@ -1,5 +1,21 @@
2015-07-16 Matthew Hanson <matthew_han...@apple.com>
+ Merge r186879. rdar://problem/21758704
+
+ 2015-07-15 Dean Jackson <d...@apple.com>
+
+ Tag WebGL layers with sRGB colorspace
+ https://bugs.webkit.org/show_bug.cgi?id=146986
+ <rdar://problem/21758704>
+
+ Fix the build on older El Capitan releases.
+
+ * platform/graphics/mac/WebGLLayer.mm:
+ (-[WebGLLayer initWithGraphicsContext3D:]):
+ * platform/spi/cocoa/QuartzCoreSPI.h:
+
+2015-07-16 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186878. rdar://problem/21758722
2015-07-15 Sam Weinig <s...@webkit.org>
Modified: branches/safari-601.1-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm (186939 => 186940)
--- branches/safari-601.1-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm 2015-07-17 05:33:05 UTC (rev 186939)
+++ branches/safari-601.1-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm 2015-07-17 05:33:08 UTC (rev 186940)
@@ -54,7 +54,8 @@
#if PLATFORM(MAC)
self.contentsScale = _devicePixelRatio;
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
- self.colorspace = sRGBColorSpaceRef();
+ if ([self respondsToSelector:@selector(setColorspace:)])
+ [self setColorspace:sRGBColorSpaceRef()];
#endif
#endif
return self;
Modified: branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (186939 => 186940)
--- branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-07-17 05:33:05 UTC (rev 186939)
+++ branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-07-17 05:33:08 UTC (rev 186940)
@@ -97,6 +97,12 @@
- (void)setNeedsDisplayInRect:(CGRect)rect levelOfDetail:(int)levelOfDetail options:(NSDictionary *)dictionary;
@end
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+@interface CAOpenGLLayer (Details)
+@property CGColorSpaceRef colorspace;
+@end
+#endif
+
struct CAColorMatrix {
float m11, m12, m13, m14, m15;
float m21, m22, m23, m24, m25;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
