Title: [187321] branches/safari-601.1-branch/Source/WebCore
- Revision
- 187321
- Author
- [email protected]
- Date
- 2015-07-24 00:54:35 -0700 (Fri, 24 Jul 2015)
Log Message
Merge r187216. rdar://problem/21032083
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187320 => 187321)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-24 07:54:33 UTC (rev 187320)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-24 07:54:35 UTC (rev 187321)
@@ -1,5 +1,15 @@
2015-07-24 Matthew Hanson <[email protected]>
+ Merge r187216. rdar://problem/21032083
+
+ 2015-07-22 Tim Horton <[email protected]>
+
+ Try to fix the build
+
+ * platform/spi/cocoa/QuartzCoreSPI.h:
+
+2015-07-24 Matthew Hanson <[email protected]>
+
Merge r187215. rdar://problem/21032083
2015-07-22 James Savage <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (187320 => 187321)
--- branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-07-24 07:54:33 UTC (rev 187320)
+++ branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-07-24 07:54:35 UTC (rev 187321)
@@ -32,10 +32,13 @@
#include <QuartzCore/CARenderServer.h>
#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
// headers in an extern "C" linkage block to make it suitable for Objective-C++ use. Once this
// bug has been fixed we can simply include header <QuartzCore/QuartzCorePrivate.h> instead of
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
