Changeset 187321 in webkit

Timestamp:

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

Author:

matthew_hanson@apple.com

Message:

Merge r187216. 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 r187216. rdar://problem/21032083
+
+    2015-07-22  Tim 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

@@ -33 +33 @@
 
 #ifdef __OBJC__
-#import <QuartzCore/CADisplay.h>
 #import <QuartzCore/CALayerHost.h>
 #import <QuartzCore/CALayerPrivate.h>
+
+#if PLATFORM(IOS)
+#import <QuartzCore/CADisplay.h>
+#endif
 
 // FIXME: As a workaround for <rdar://problem/18985152>, we conditionally enclose the following