Title: [187322] branches/safari-601.1-branch/Source/WebCore
- Revision
- 187322
- Author
- [email protected]
- Date
- 2015-07-24 00:54:37 -0700 (Fri, 24 Jul 2015)
Log Message
Merge r187219. rdar://problem/21032083
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187321 => 187322)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-24 07:54:35 UTC (rev 187321)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-24 07:54:37 UTC (rev 187322)
@@ -1,5 +1,15 @@
2015-07-24 Matthew Hanson <[email protected]>
+ Merge r187219. rdar://problem/21032083
+
+ 2015-07-23 Timothy Horton <[email protected]>
+
+ Try to fix the build
+
+ * platform/spi/cocoa/QuartzCoreSPI.h:
+
+2015-07-24 Matthew Hanson <[email protected]>
+
Merge r187216. rdar://problem/21032083
2015-07-22 Tim Horton <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (187321 => 187322)
--- branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-07-24 07:54:35 UTC (rev 187321)
+++ branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-07-24 07:54:37 UTC (rev 187322)
@@ -102,6 +102,15 @@
- (void)setNeedsDisplayInRect:(CGRect)rect levelOfDetail:(int)levelOfDetail options:(NSDictionary *)dictionary;
@end
+#if PLATFORM(IOS)
+@interface CADisplay : NSObject
+@end
+
+@interface CADisplay ()
+@property (nonatomic, readonly) NSString *name;
+@end
+#endif
+
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
@interface CAOpenGLLayer (Details)
@property CGColorSpaceRef colorspace;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
