Title: [181967] tags/Safari-601.1.24/Source/WebCore
Diff
Modified: tags/Safari-601.1.24/Source/WebCore/ChangeLog (181966 => 181967)
--- tags/Safari-601.1.24/Source/WebCore/ChangeLog 2015-03-25 17:55:28 UTC (rev 181966)
+++ tags/Safari-601.1.24/Source/WebCore/ChangeLog 2015-03-25 18:29:19 UTC (rev 181967)
@@ -1,3 +1,13 @@
+2015-03-25 Babak Shafiei <[email protected]>
+
+ Merge r181958.
+
+ 2015-03-25 Dan Bernstein <[email protected]>
+
+ iOS Simulator build fix.
+
+ * platform/spi/cocoa/IOSurfaceSPI.h:
+
2015-03-25 Commit Queue <[email protected]>
Unreviewed, rolling out r181932.
Modified: tags/Safari-601.1.24/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h (181966 => 181967)
--- tags/Safari-601.1.24/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h 2015-03-25 17:55:28 UTC (rev 181966)
+++ tags/Safari-601.1.24/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h 2015-03-25 18:29:19 UTC (rev 181967)
@@ -26,6 +26,8 @@
#ifndef IOSurfaceSPI_h
#define IOSurfaceSPI_h
+#if !PLATFORM(IOS_SIMULATOR)
+
#if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
#include <IOSurface/IOSurface.h>
@@ -92,4 +94,6 @@
WTF_EXTERN_C_END
+#endif
+
#endif // IOSurfaceSPI_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
