Changeset 187322 in webkit

Timestamp:

Jul 24, 2015, 12:54:37 AM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r187219. rdar://problem/21032083

Location:

branches/safari-601.1-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/spi/cocoa/QuartzCoreSPI.h (modified) (1 diff)

branches/safari-601.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187219. rdar://problem/21032083
+
+    2015-07-23  Timothy Horton  <timothy_horton@apple.com>
+
+            Try to fix the build
+
+            * platform/spi/cocoa/QuartzCoreSPI.h:
+
 2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h

@@ -103 +103 @@
 @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)