Title: [219160] trunk/Source/WebCore
- Revision
- 219160
- Author
- [email protected]
- Date
- 2017-07-05 15:25:06 -0700 (Wed, 05 Jul 2017)
Log Message
Further attempts to fix the iOS public SDK build.
* platform/graphics/cocoa/IOSurface.mm:
(WebCore::IOSurface::surfaceID):
* platform/spi/cocoa/IOSurfaceSPI.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (219159 => 219160)
--- trunk/Source/WebCore/ChangeLog 2017-07-05 22:08:05 UTC (rev 219159)
+++ trunk/Source/WebCore/ChangeLog 2017-07-05 22:25:06 UTC (rev 219160)
@@ -1,3 +1,11 @@
+2017-07-05 Simon Fraser <[email protected]>
+
+ Further attempts to fix the iOS public SDK build.
+
+ * platform/graphics/cocoa/IOSurface.mm:
+ (WebCore::IOSurface::surfaceID):
+ * platform/spi/cocoa/IOSurfaceSPI.h:
+
2017-07-05 Don Olmstead <[email protected]>
[WinCairo] Consolidate CMake code related to CURL
Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (219159 => 219160)
--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2017-07-05 22:08:05 UTC (rev 219159)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2017-07-05 22:25:06 UTC (rev 219160)
@@ -365,7 +365,11 @@
IOSurfaceID IOSurface::surfaceID() const
{
+#if __IPHONE_OS_VERSION_MIN_REQUIRED < 110000
+ return 0;
+#else
return IOSurfaceGetID(m_surface.get());
+#endif
}
bool IOSurface::isInUse() const
Modified: trunk/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h (219159 => 219160)
--- trunk/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h 2017-07-05 22:08:05 UTC (rev 219159)
+++ trunk/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h 2017-07-05 22:25:06 UTC (rev 219160)
@@ -116,7 +116,6 @@
#if __IPHONE_OS_VERSION_MIN_REQUIRED < 110000
typedef uint32_t IOSurfaceID;
-IOSurfaceID IOSurfaceGetID(IOSurfaceRef);
#endif
typedef struct __IOSurfaceAccelerator *IOSurfaceAcceleratorRef;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
