[iOS] Fix iphoneos SDK builds for ios-ews queue
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Jan 2015 19:27:25 +0000 (19:27 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Jan 2015 19:27:25 +0000 (19:27 +0000)
<http://webkit.org/b/140748>

Reviewed by Daniel Bates.

Source/WebCore:

* WebCore.xcodeproj/project.pbxproj: Add new SPI headers.
* platform/graphics/cg/ImageBufferCG.cpp: Switch to using
"IOSurfaceSPI.h" from <IOSurface/IOSurface.h>.
* platform/graphics/cg/ImageBufferDataCG.cpp: Ditto.
* platform/graphics/cocoa/IOSurface.mm: Ditto.  Move definitions
in <IOSurface/IOSurfacePrivate.h> into "IOSurfaceSPI.h".
* platform/spi/cg/CoreGraphicsSPI.h: Switch to
WTF_EXTERN_C_{BEGIN,END}.  Add
CGContextGetFontAntialiasingStyle() and
CGContextSetFontAntialiasingStyle().
* platform/spi/cocoa/IOPMLibSPI.h: Switch to use IOReturnSPI.h.
* platform/spi/cocoa/IOReturnSPI.h: Add.
* platform/spi/cocoa/IOSurfaceSPI.h: Add.
* platform/spi/cocoa/IOTypesSPI.h: Add.

Source/WebKit2:

* Platform/spi/ios/BKSProcessAssertionSPI.h: Add -invalidate
definition.  Sort @property to the top of BKSProcessAssertion.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@178927 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
Source/WebCore/ChangeLog
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp
Source/WebCore/platform/graphics/cocoa/IOSurface.mm
Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h
Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h
Source/WebCore/platform/spi/cocoa/IOReturnSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cocoa/IOTypesSPI.h [new file with mode: 0644]
Source/WebKit2/ChangeLog
Source/WebKit2/Platform/spi/ios/BKSProcessAssertionSPI.h

index de3e569d1a21676876f8cfe179c0365b1a6852aa..95db74828f740d308e6232c2801ac42ebf2fd547 100644 (file)
@@ -1,3 +1,25 @@
+2015-01-22  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Fix iphoneos SDK builds for ios-ews queue
+        <http://webkit.org/b/140748>
+
+        Reviewed by Daniel Bates.
+
+        * WebCore.xcodeproj/project.pbxproj: Add new SPI headers.
+        * platform/graphics/cg/ImageBufferCG.cpp: Switch to using
+        "IOSurfaceSPI.h" from <IOSurface/IOSurface.h>.
+        * platform/graphics/cg/ImageBufferDataCG.cpp: Ditto.
+        * platform/graphics/cocoa/IOSurface.mm: Ditto.  Move definitions
+        in <IOSurface/IOSurfacePrivate.h> into "IOSurfaceSPI.h".
+        * platform/spi/cg/CoreGraphicsSPI.h: Switch to
+        WTF_EXTERN_C_{BEGIN,END}.  Add
+        CGContextGetFontAntialiasingStyle() and
+        CGContextSetFontAntialiasingStyle().
+        * platform/spi/cocoa/IOPMLibSPI.h: Switch to use IOReturnSPI.h.
+        * platform/spi/cocoa/IOReturnSPI.h: Add.
+        * platform/spi/cocoa/IOSurfaceSPI.h: Add.
+        * platform/spi/cocoa/IOTypesSPI.h: Add.
+
 2015-01-21  Sergio Villar Senin  <svillar@igalia.com>
 
         [CSS Grid Layout] Skip items spanning flex tracks when sizing content based tracks
index e134609c4ce778d79783dff45efa4faad4ec27f2..52b188b4b949ea8fc619524aa873a3ade4292fa2 100644 (file)
                44C991A00F3D210E00586670 /* ThemeIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 44C9919E0F3D210E00586670 /* ThemeIOS.mm */; };
                44DAB5B115A623580097C1E4 /* Extensions3DOpenGLCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44DAB5AF15A623580097C1E4 /* Extensions3DOpenGLCommon.cpp */; };
                44DAB5B215A623580097C1E4 /* Extensions3DOpenGLCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 44DAB5B015A623580097C1E4 /* Extensions3DOpenGLCommon.h */; };
+               44DEF6431A6FF92700D45EEC /* IOReturnSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 44DEF6421A6FF92700D45EEC /* IOReturnSPI.h */; };
+               44DFF6431A6FF92700D45EEC /* IOSurfaceSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 44DFF6421A6FF92700D45EEC /* IOSurfaceSPI.h */; };
+               44EFF6431A6FF92700D45EEC /* IOTypesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 44EFF6421A6FF92700D45EEC /* IOTypesSPI.h */; };
                45099C411370A7800058D513 /* IconURL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45099C401370A7800058D513 /* IconURL.cpp */; };
                450CEBF015073BBE002BB149 /* LabelableElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 450CEBEE15073BBE002BB149 /* LabelableElement.cpp */; };
                450CEBF115073BBE002BB149 /* LabelableElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 450CEBEF15073BBE002BB149 /* LabelableElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
                44D8DA9A139545CD00337B75 /* SVGAnimateMotionElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SVGAnimateMotionElement.idl; sourceTree = "<group>"; };
                44DAB5AF15A623580097C1E4 /* Extensions3DOpenGLCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Extensions3DOpenGLCommon.cpp; sourceTree = "<group>"; };
                44DAB5B015A623580097C1E4 /* Extensions3DOpenGLCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Extensions3DOpenGLCommon.h; sourceTree = "<group>"; };
+               44DEF6421A6FF92700D45EEC /* IOReturnSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOReturnSPI.h; sourceTree = "<group>"; };
+               44DFF6421A6FF92700D45EEC /* IOSurfaceSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOSurfaceSPI.h; sourceTree = "<group>"; };
+               44EFF6421A6FF92700D45EEC /* IOTypesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOTypesSPI.h; sourceTree = "<group>"; };
                45099C401370A7800058D513 /* IconURL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IconURL.cpp; sourceTree = "<group>"; };
                450CEBEE15073BBE002BB149 /* LabelableElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LabelableElement.cpp; sourceTree = "<group>"; };
                450CEBEF15073BBE002BB149 /* LabelableElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelableElement.h; sourceTree = "<group>"; };
                                CE12524A1A16C79B00864480 /* DispatchSPI.h */,
                                CE1252441A16C22500864480 /* DynamicLinkerSPI.h */,
                                CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */,
+                               44DEF6421A6FF92700D45EEC /* IOReturnSPI.h */,
+                               44DFF6421A6FF92700D45EEC /* IOSurfaceSPI.h */,
+                               44EFF6421A6FF92700D45EEC /* IOTypesSPI.h */,
                                CE12524E1A1A78D200864480 /* MachVMSPI.h */,
                                CE1252501A1BEBD800864480 /* NSCalendarDateSPI.h */,
                                2DDB97F319F9AECA002025D8 /* NSExtensionSPI.h */,
                                B27535750B053814002CE64F /* IntSize.h in Headers */,
                                B27535760B053814002CE64F /* IntSizeHash.h in Headers */,
                                CE12524D1A1A77DE00864480 /* IOPMLibSPI.h in Headers */,
+                               44DEF6431A6FF92700D45EEC /* IOReturnSPI.h in Headers */,
                                2D0B4AAB18DA1CCD00434DE1 /* IOSurface.h in Headers */,
                                1C21E57D183ED1FF001C289D /* IOSurfacePool.h in Headers */,
+                               44DFF6431A6FF92700D45EEC /* IOSurfaceSPI.h in Headers */,
+                               44EFF6431A6FF92700D45EEC /* IOTypesSPI.h in Headers */,
                                07AC47021952102100EE9723 /* ISOVTTCue.h in Headers */,
                                418F88050FF957AF0080F045 /* JSAbstractWorker.h in Headers */,
                                0705851B17FB44B4005F2BCB /* JSAllAudioCapabilities.h in Headers */,
index 9d6d5280c8f768c64d069925daeb1484a4a89baf..f5825f5042be1316eecf906814091cc99c233ed0 100644 (file)
@@ -49,7 +49,7 @@
 
 #if USE(IOSURFACE_CANVAS_BACKING_STORE)
 #include "IOSurface.h"
-#include <IOSurface/IOSurface.h>
+#include "IOSurfaceSPI.h"
 #endif
 
 // CA uses ARGB32 for textures and ARGB32 -> ARGB32 resampling is optimized.
index e7ec862eea9118897ffc3ec077dbaff39f6d6ec5..822be7fd631bf42aec2d2b8761268937da7ae649 100644 (file)
@@ -35,7 +35,7 @@
 #endif
 
 #if USE(IOSURFACE_CANVAS_BACKING_STORE)
-#include <IOSurface/IOSurface.h>
+#include "IOSurfaceSPI.h"
 #include <dispatch/dispatch.h>
 #endif
 
index a849d26ffac7acd2d02d78dd60e8467ef569e868..7ef787377bcd790897601e06681d2e70a2e95b49 100644 (file)
 
 #import "GraphicsContextCG.h"
 #import "IOSurfacePool.h"
+#import "IOSurfaceSPI.h"
 #import "MachSendRight.h"
-#import <IOSurface/IOSurface.h>
 #import <wtf/Assertions.h>
 
-#if __has_include(<IOSurface/IOSurfacePrivate.h>)
-#import <IOSurface/IOSurfacePrivate.h>
-#else
-enum {
-    kIOSurfacePurgeableNonVolatile = 0,
-    kIOSurfacePurgeableVolatile = 1,
-    kIOSurfacePurgeableEmpty = 2,
-    kIOSurfacePurgeableKeepCurrent = 3,
-};
-#endif
-
 extern "C" {
 CGContextRef CGIOSurfaceContextCreate(IOSurfaceRef, size_t, size_t, size_t, size_t, CGColorSpaceRef, CGBitmapInfo);
 CGImageRef CGIOSurfaceContextCreateImage(CGContextRef);
-IOReturn IOSurfaceSetPurgeable(IOSurfaceRef, uint32_t, uint32_t *);
 }
 
 using namespace WebCore;
index d7d246d82f94812921c65de2aa60968502dfad55..1fcb620f83477fc0bba30ddbff3ed337c8f4e53c 100644 (file)
@@ -112,43 +112,50 @@ typedef struct CGFontCache CGFontCache;
 
 #endif // USE(APPLE_INTERNAL_SDK)
 
-EXTERN_C CGColorRef CGColorTransformConvertColor(CGColorTransformRef, CGColorRef, CGColorRenderingIntent);
-EXTERN_C CGColorTransformRef CGColorTransformCreate(CGColorSpaceRef, CFDictionaryRef attributes);
-
-EXTERN_C CGAffineTransform CGContextGetBaseCTM(CGContextRef);
-EXTERN_C CGCompositeOperation CGContextGetCompositeOperation(CGContextRef);
-EXTERN_C CGColorRef CGContextGetFillColorAsColor(CGContextRef);
-EXTERN_C CGFloat CGContextGetLineWidth(CGContextRef);
-EXTERN_C bool CGContextGetShouldSmoothFonts(CGContextRef);
-EXTERN_C void CGContextSetBaseCTM(CGContextRef, CGAffineTransform);
-EXTERN_C void CGContextSetCTM(CGContextRef, CGAffineTransform);
-EXTERN_C void CGContextSetCompositeOperation(CGContextRef, CGCompositeOperation);
-EXTERN_C void CGContextSetShouldAntialiasFonts(CGContextRef, bool shouldAntialiasFonts);
-
-EXTERN_C CFStringRef CGFontCopyFamilyName(CGFontRef);
-EXTERN_C bool CGFontGetDescriptor(CGFontRef, CGFontDescriptor*);
-EXTERN_C bool CGFontGetGlyphAdvancesForStyle(CGFontRef, const CGAffineTransform* , CGFontRenderingStyle, const CGGlyph[], size_t count, CGSize advances[]);
-EXTERN_C void CGFontGetGlyphsForUnichars(CGFontRef, const UniChar[], CGGlyph[], size_t count);
-EXTERN_C const CGFontHMetrics* CGFontGetHMetrics(CGFontRef);
-EXTERN_C const char* CGFontGetPostScriptName(CGFontRef);
-EXTERN_C bool CGFontIsFixedPitch(CGFontRef);
-EXTERN_C void CGFontSetShouldUseMulticache(bool);
-
-EXTERN_C void CGImageSetCachingFlags(CGImageRef, CGImageCachingFlags);
-EXTERN_C CGImageCachingFlags CGImageGetCachingFlags(CGImageRef);
-
-EXTERN_C CGDataProviderRef CGPDFDocumentGetDataProvider(CGPDFDocumentRef);
+WTF_EXTERN_C_BEGIN
+
+CGColorRef CGColorTransformConvertColor(CGColorTransformRef, CGColorRef, CGColorRenderingIntent);
+CGColorTransformRef CGColorTransformCreate(CGColorSpaceRef, CFDictionaryRef attributes);
+
+CGAffineTransform CGContextGetBaseCTM(CGContextRef);
+CGCompositeOperation CGContextGetCompositeOperation(CGContextRef);
+CGColorRef CGContextGetFillColorAsColor(CGContextRef);
+CGFloat CGContextGetLineWidth(CGContextRef);
+bool CGContextGetShouldSmoothFonts(CGContextRef);
+void CGContextSetBaseCTM(CGContextRef, CGAffineTransform);
+void CGContextSetCTM(CGContextRef, CGAffineTransform);
+void CGContextSetCompositeOperation(CGContextRef, CGCompositeOperation);
+void CGContextSetShouldAntialiasFonts(CGContextRef, bool shouldAntialiasFonts);
+
+CFStringRef CGFontCopyFamilyName(CGFontRef);
+bool CGFontGetDescriptor(CGFontRef, CGFontDescriptor*);
+bool CGFontGetGlyphAdvancesForStyle(CGFontRef, const CGAffineTransform* , CGFontRenderingStyle, const CGGlyph[], size_t count, CGSize advances[]);
+void CGFontGetGlyphsForUnichars(CGFontRef, const UniChar[], CGGlyph[], size_t count);
+const CGFontHMetrics* CGFontGetHMetrics(CGFontRef);
+const char* CGFontGetPostScriptName(CGFontRef);
+bool CGFontIsFixedPitch(CGFontRef);
+void CGFontSetShouldUseMulticache(bool);
+
+void CGImageSetCachingFlags(CGImageRef, CGImageCachingFlags);
+CGImageCachingFlags CGImageGetCachingFlags(CGImageRef);
+
+CGDataProviderRef CGPDFDocumentGetDataProvider(CGPDFDocumentRef);
+
+CGFontAntialiasingStyle CGContextGetFontAntialiasingStyle(CGContextRef);
+void CGContextSetFontAntialiasingStyle(CGContextRef, CGFontAntialiasingStyle);
 
 #if PLATFORM(COCOA)
-EXTERN_C CGSRegionEnumeratorObj CGSRegionEnumerator(CGRegionRef);
-EXTERN_C CGRect* CGSNextRect(const CGSRegionEnumeratorObj);
-EXTERN_C CGError CGSReleaseRegionEnumerator(const CGSRegionEnumeratorObj);
+CGSRegionEnumeratorObj CGSRegionEnumerator(CGRegionRef);
+CGRect* CGSNextRect(const CGSRegionEnumeratorObj);
+CGError CGSReleaseRegionEnumerator(const CGSRegionEnumeratorObj);
 #endif
 
 #if PLATFORM(WIN)
-EXTERN_C CGFontCache* CGFontCacheGetLocalCache();
-EXTERN_C void CGFontCacheSetShouldAutoExpire(CGFontCache*, bool);
-EXTERN_C void CGFontCacheSetMaxSize(CGFontCache*, size_t);
+CGFontCache* CGFontCacheGetLocalCache();
+void CGFontCacheSetShouldAutoExpire(CGFontCache*, bool);
+void CGFontCacheSetMaxSize(CGFontCache*, size_t);
 #endif
 
+WTF_EXTERN_C_END
+
 #endif // CoreGraphicsSPI_h
index 6a03a5f23cebc47f8270c71f5d27c2d9b5ab97dc..03b9c54fe98dd385453e44247782e0b127e43661 100644 (file)
@@ -34,9 +34,8 @@
 
 #else
 
-#include <mach/kern_return.h>
+#include "IOReturnSPI.h"
 
-typedef kern_return_t IOReturn;
 typedef uint32_t IOPMAssertionID;
 
 EXTERN_C const CFStringRef kIOPMAssertionTypePreventUserIdleDisplaySleep = CFSTR("PreventUserIdleDisplaySleep");
diff --git a/Source/WebCore/platform/spi/cocoa/IOReturnSPI.h b/Source/WebCore/platform/spi/cocoa/IOReturnSPI.h
new file mode 100644 (file)
index 0000000..1500c9c
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef IOReturnSPI_h
+#define IOReturnSPI_h
+
+#if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
+
+#include <IOKit/IOReturn.h>
+
+#else
+
+#include <mach/kern_return.h>
+
+typedef kern_return_t IOReturn;
+
+#endif
+
+#endif // IOReturnSPI_h
diff --git a/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h b/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h
new file mode 100644 (file)
index 0000000..a7edb15
--- /dev/null
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef IOSurfaceSPI_h
+#define IOSurfaceSPI_h
+
+#if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
+
+#include <IOSurface/IOSurface.h>
+
+#else
+
+#include "IOReturnSPI.h"
+#include "IOTypesSPI.h"
+#include <CoreFoundation/CFBase.h>
+#include <mach/mach_port.h>
+
+typedef struct __IOSurface *IOSurfaceRef;
+
+enum {
+    kIOSurfaceLockReadOnly  = 0x00000001,
+};
+
+#endif
+
+WTF_EXTERN_C_BEGIN
+
+extern const CFStringRef kIOSurfaceAllocSize;
+extern const CFStringRef kIOSurfaceBytesPerElement;
+extern const CFStringRef kIOSurfaceBytesPerRow;
+extern const CFStringRef kIOSurfaceCacheMode;
+extern const CFStringRef kIOSurfaceHeight;
+extern const CFStringRef kIOSurfacePixelFormat;
+extern const CFStringRef kIOSurfaceWidth;
+
+size_t IOSurfaceAlignProperty(CFStringRef property, size_t value);
+IOSurfaceRef IOSurfaceCreate(CFDictionaryRef properties);
+mach_port_t IOSurfaceCreateMachPort(IOSurfaceRef buffer);
+size_t IOSurfaceGetAllocSize(IOSurfaceRef buffer);
+void *IOSurfaceGetBaseAddress(IOSurfaceRef buffer);
+size_t IOSurfaceGetBytesPerRow(IOSurfaceRef buffer);
+size_t IOSurfaceGetHeight(IOSurfaceRef buffer);
+size_t IOSurfaceGetPropertyMaximum(CFStringRef property);
+size_t IOSurfaceGetWidth(IOSurfaceRef buffer);
+Boolean IOSurfaceIsInUse(IOSurfaceRef buffer);
+IOReturn IOSurfaceLock(IOSurfaceRef buffer, uint32_t options, uint32_t *seed);
+IOSurfaceRef IOSurfaceLookupFromMachPort(mach_port_t);
+IOReturn IOSurfaceUnlock(IOSurfaceRef buffer, uint32_t options, uint32_t *seed);
+
+WTF_EXTERN_C_END
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <IOSurface/IOSurfacePrivate.h>
+
+#else
+
+enum {
+    kIOSurfacePurgeableNonVolatile = 0,
+    kIOSurfacePurgeableVolatile = 1,
+    kIOSurfacePurgeableEmpty = 2,
+    kIOSurfacePurgeableKeepCurrent = 3,
+};
+
+#endif
+
+WTF_EXTERN_C_BEGIN
+
+IOReturn IOSurfaceSetPurgeable(IOSurfaceRef buffer, uint32_t newState, uint32_t *oldState);
+
+WTF_EXTERN_C_END
+
+#endif // IOSurfaceSPI_h
diff --git a/Source/WebCore/platform/spi/cocoa/IOTypesSPI.h b/Source/WebCore/platform/spi/cocoa/IOTypesSPI.h
new file mode 100644 (file)
index 0000000..f399dc3
--- /dev/null
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef IOTypesSPI_h
+#define IOTypesSPI_h
+
+#if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
+
+#include <IOKit/IOTypes.h>
+
+#else
+
+enum {
+    kIOWriteCombineCache = 4,
+};
+
+enum {
+    kIOMapCacheShift = 8,
+    kIOMapWriteCombineCache = kIOWriteCombineCache << kIOMapCacheShift,
+};
+
+#endif
+
+#endif // IOTypesSPI_h
index ff5bc41490a089b86e5d4e49a76b880ae33fe81f..1f03ff1f00de451f1e424d4b11886d596e98a321 100644 (file)
@@ -1,3 +1,13 @@
+2015-01-22  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Fix iphoneos SDK builds for ios-ews queue
+        <http://webkit.org/b/140748>
+
+        Reviewed by Daniel Bates.
+
+        * Platform/spi/ios/BKSProcessAssertionSPI.h: Add -invalidate
+        definition.  Sort @property to the top of BKSProcessAssertion.
+
 2015-01-22  Shivakumar JM  <shiva.jm@samsung.com>
 
         Fix build warning in WebKit2/UIProcess module
index 631abfadd0f35d9a5fde1c06a35c649434ebd746..63f9376abb04dc508448785591e8116082729512 100644 (file)
@@ -52,8 +52,9 @@ typedef void(^BKSProcessAssertionAcquisitionHandler)(BOOL acquired);
 @end
 
 @interface BKSProcessAssertion (Details)
-- (id)initWithPID:(pid_t)pid flags:(BKSProcessAssertionFlags)flags reason:(BKSProcessAssertionReason)reason name:(NSString *)name withHandler:(BKSProcessAssertionAcquisitionHandler)handler;
 @property (nonatomic, assign) BKSProcessAssertionFlags flags;
+- (id)initWithPID:(pid_t)pid flags:(BKSProcessAssertionFlags)flags reason:(BKSProcessAssertionReason)reason name:(NSString *)name withHandler:(BKSProcessAssertionAcquisitionHandler)handler;
+- (void)invalidate;
 @end
 
 #endif