[iOS] Make WebCore build with public iOS SDK
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Sep 2014 18:18:02 +0000 (18:18 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Sep 2014 18:18:02 +0000 (18:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=136487

Reviewed by David Kilzer.

Source/WebCore:

Add headers that wrap Mac and iOS SPIs and update WebCore source files to include these
headers instead of the corresponding actual SPI header(s).

* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.vcxproj/WebCoreCG.props:
* WebCore.vcxproj/copyForwardingHeaders.cmd:
* WebCore.xcodeproj/project.pbxproj:
* bindings/objc/DOMInternal.mm:
* bridge/objc/objc_instance.mm:
* platform/audio/ios/MediaSessionManagerIOS.mm:
* platform/cocoa/DisplaySleepDisablerCocoa.cpp:
* platform/cocoa/MemoryPressureHandlerCocoa.mm:
* platform/graphics/SimpleFontData.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
* platform/graphics/cg/BitmapImageCG.cpp:
* platform/graphics/cg/ColorCG.cpp:
* platform/graphics/cg/GraphicsContextCG.cpp:
* platform/graphics/cg/ImageSourceCG.cpp:
* platform/graphics/cg/PDFDocumentImage.cpp:
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
* platform/graphics/ios/FontCacheIOS.mm:
* platform/graphics/ios/FontServicesIOS.mm:
* platform/graphics/ios/SimpleFontDataIOS.mm:
* platform/graphics/mac/FontMac.mm:
* platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
* platform/graphics/mac/MediaPlayerProxy.h:
* platform/graphics/mac/SimpleFontDataMac.mm:
* platform/ios/LegacyTileCache.mm:
* platform/ios/LegacyTileGrid.mm:
* platform/ios/LegacyTileGridTile.mm:
* platform/ios/PlatformEventFactoryIOS.mm:
* platform/ios/PlatformScreenIOS.mm:
* platform/ios/WebEvent.mm:
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
* platform/ios/wak/WAKAppKitStubs.h:
* platform/ios/wak/WAKView.h:
* platform/ios/wak/WKGraphics.h:
* platform/ios/wak/WKGraphics.mm:
* platform/ios/wak/WebCoreThread.mm:
* platform/network/ios/QuickLook.mm:
* platform/spi/ca/CALayerSPI.h: Added.
* platform/spi/ca/CATiledLayerSPI.h: Added.
* platform/spi/cf/CFLocaleSPI.h: Modified to use EXTERN_C.
* platform/spi/cf/CFNetworkConnectionCacheSPI.h: Ditto. Also changed header visibility from private to project.
* platform/spi/cf/CFURLRequestSPI.h: Ditto. Also modified to unconditionally include header <CoreFoundation/CFBase.h>.
* platform/spi/cg/CGColorTransformSPI.h: Added.
* platform/spi/cg/CGContextSPI.h: Added.
* platform/spi/cg/CGFloatSPI.h: Added.
* platform/spi/cg/CGFontGlyphSupportSPI.h: Added.
* platform/spi/cg/CGFontInfoSPI.h: Added.
* platform/spi/cg/CGFontRenderingSPI.h: Added.
* platform/spi/cg/CGFontUnicodeSupportSPI.h: Added.
* platform/spi/cg/CGImageSPI.h: Added.
* platform/spi/cg/CGSRegionSPI.h: Added.
* platform/spi/cocoa/DispatchSPI.h: Added.
* platform/spi/cocoa/IOPMLibSPI.h: Added.
* platform/spi/cocoa/MachVMSPI.h: Added.
* platform/spi/cocoa/NSFileManagerSPI.h: Added.
* platform/spi/cocoa/NSGeometrySPI.h: Added.
* platform/spi/cocoa/NSPointerFunctionsSPI.h: Added.
* platform/spi/cocoa/dyldSPI.h: Added.
* platform/spi/ios/AVPlayerControllerSPI.h: Added.
* platform/spi/ios/AVPlayerViewControllerSPI.h: Added.
* platform/spi/ios/AVValueTimingSPI.h: Added.
* platform/spi/ios/AVVideoLayerSPI.h: Added.
* platform/spi/ios/CTFontDescriptorSPI.h: Added.
* platform/spi/ios/CTFontSPI.h: Added.
* platform/spi/ios/CUICatalogSPI.h: Added.
* platform/spi/ios/CUIStyleEffectConfigurationSPI.h: Added.
* platform/spi/ios/MPAVRoutingControllerSPI.h: Added.
* platform/spi/ios/MobileGestaltSPI.h: Added.
* platform/spi/ios/QLPreviewConverterSPI.h: Added.
* platform/spi/ios/QuickLookSPI.h: Added.
* rendering/RenderThemeIOS.mm:

Source/WebKit/ios:

Substitute <WebCore/CGFloatSPI.h> for <CoreGraphics/CGFloat.h>.

* WebCoreSupport/WebFixedPositionContent.mm:

Source/WebKit/mac:

Update WebKit1 source files to include the wrapper SPI headers instead of the corresponding
actual SPI header(s).

* DOM/WebDOMOperationsPrivate.h:
* MigrateHeaders.make: Modified to only modify the include path of a "<WebCore/"-prefixed header
file if its filename doesn't end in "SPI.h" as an alternative to having MigrateHeaders.make copy
such files into the WebKit framework as private headers.
* WebCoreSupport/WebFrameLoaderClient.mm:
* WebInspector/WebNodeHighlight.mm:
* WebView/WebIndicateLayer.mm:
* WebView/WebRenderLayer.h:
* WebView/WebView.mm:

Source/WebKit2:

Update WebKit2 source files to include the wrapper SPI headers instead of the corresponding
actual SPI header(s).

* Platform/mac/SharedMemoryMac.cpp:
* Shared/ios/NativeWebTouchEventIOS.mm:
* Shared/mac/RemoteLayerBackingStore.mm:
* Shared/mac/RemoteLayerTreePropertyApplier.mm:
* UIProcess/API/Cocoa/WKWebView.mm:
* UIProcess/ios/WKPDFPageNumberIndicator.mm:
* UIProcess/ios/WKScrollView.mm:
* UIProcess/ios/WebMemoryPressureHandlerIOS.mm:
* UIProcess/ios/forms/WKAirPlayRoutePicker.mm:
* WebProcess/WebPage/WebPage.cpp:

Source/WTF:

Define convenience macro EXTERN_C that can be used to specify the C linkage convention
for a declaration. For example, the declaration "EXTERN_C const int x;" will expand to:

extern const int x;

and

extern "C" const int x;

when used in a C and C++ file, respectively.

* wtf/Compiler.h:

Tools:

Substitute <WebCore/MachVMSPI.h> for <mach/mach_vm.h>.

* DumpRenderTree/mac/CheckedMalloc.cpp:

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

99 files changed:
Source/WTF/ChangeLog
Source/WTF/wtf/Compiler.h
Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.vcxproj/WebCoreCG.props
Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/objc/DOMInternal.mm
Source/WebCore/bridge/objc/objc_instance.mm
Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm
Source/WebCore/platform/cocoa/DisplaySleepDisablerCocoa.cpp
Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm
Source/WebCore/platform/graphics/SimpleFontData.h
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp
Source/WebCore/platform/graphics/cg/ColorCG.cpp
Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp
Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp
Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
Source/WebCore/platform/graphics/ios/FontServicesIOS.mm
Source/WebCore/platform/graphics/ios/SimpleFontDataIOS.mm
Source/WebCore/platform/graphics/mac/FontMac.mm
Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp
Source/WebCore/platform/graphics/mac/MediaPlayerProxy.h
Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
Source/WebCore/platform/ios/LegacyTileCache.mm
Source/WebCore/platform/ios/LegacyTileGrid.mm
Source/WebCore/platform/ios/LegacyTileGridTile.mm
Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm
Source/WebCore/platform/ios/PlatformScreenIOS.mm
Source/WebCore/platform/ios/WebEvent.mm
Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm
Source/WebCore/platform/ios/wak/WAKAppKitStubs.h
Source/WebCore/platform/ios/wak/WAKView.h
Source/WebCore/platform/ios/wak/WKGraphics.h
Source/WebCore/platform/ios/wak/WKGraphics.mm
Source/WebCore/platform/ios/wak/WebCoreThread.mm
Source/WebCore/platform/network/ios/QuickLook.mm
Source/WebCore/platform/spi/ca/CALayerSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/ca/CATiledLayerSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cf/CFLocaleSPI.h
Source/WebCore/platform/spi/cf/CFNetworkConnectionCacheSPI.h
Source/WebCore/platform/spi/cf/CFURLRequestSPI.h
Source/WebCore/platform/spi/cg/CGColorTransformSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cg/CGContextSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cg/CGFloatSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cg/CGFontGlyphSupportSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cg/CGFontInfoSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cg/CGFontRenderingSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cg/CGFontUnicodeSupportSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cg/CGImageSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cg/CGSRegionSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cocoa/DispatchSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cocoa/MachVMSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cocoa/NSFileManagerSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cocoa/NSGeometrySPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cocoa/NSPointerFunctionsSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/cocoa/dyldSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/ios/AVPlayerControllerSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/ios/AVPlayerViewControllerSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/ios/AVValueTimingSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/ios/AVVideoLayerSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/ios/CTFontDescriptorSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/ios/CTFontSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/ios/CUICatalogSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/ios/CUIStyleEffectConfigurationSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/ios/MobileGestaltSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/ios/QLPreviewConverterSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/ios/QuickLookSPI.h [new file with mode: 0644]
Source/WebCore/rendering/RenderThemeIOS.mm
Source/WebKit/ios/ChangeLog
Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h
Source/WebKit/mac/MigrateHeaders.make
Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
Source/WebKit/mac/WebInspector/WebNodeHighlight.mm
Source/WebKit/mac/WebView/WebIndicateLayer.mm
Source/WebKit/mac/WebView/WebRenderLayer.h
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/Platform/mac/SharedMemoryMac.cpp
Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm
Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm
Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.mm
Source/WebKit2/UIProcess/ios/WKScrollView.mm
Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.mm
Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Tools/ChangeLog
Tools/DumpRenderTree/mac/CheckedMalloc.cpp

index 158d076..06f4331 100644 (file)
@@ -1,3 +1,23 @@
+2014-09-17  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Make WebCore build with public iOS SDK
+        https://bugs.webkit.org/show_bug.cgi?id=136487
+
+        Reviewed by David Kilzer.
+
+        Define convenience macro EXTERN_C that can be used to specify the C linkage convention
+        for a declaration. For example, the declaration "EXTERN_C const int x;" will expand to:
+
+        extern const int x;
+
+        and
+
+        extern "C" const int x;
+
+        when used in a C and C++ file, respectively.
+
+        * wtf/Compiler.h:
+
 2014-09-16  Filip Pizlo  <fpizlo@apple.com>
 
         Unreviewed, disable native inlining because it causes build failures.
index 2a49c39..a76ea86 100644 (file)
 #define CONSTEXPR
 #endif
 
+/* EXTERN_C */
+
+#ifdef __cplusplus
+#define EXTERN_C extern "C"
+#else
+#define EXTERN_C extern
+#endif
+
 /* FALLTHROUGH */
 
 #if !defined(FALLTHROUGH) && COMPILER_SUPPORTS(FALLTHROUGH_WARNINGS) && COMPILER(CLANG)
index ee479cf..db3e19e 100644 (file)
@@ -1,3 +1,87 @@
+2014-09-17  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Make WebCore build with public iOS SDK
+        https://bugs.webkit.org/show_bug.cgi?id=136487
+
+        Reviewed by David Kilzer.
+
+        Add headers that wrap Mac and iOS SPIs and update WebCore source files to include these
+        headers instead of the corresponding actual SPI header(s).
+
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.vcxproj/WebCoreCG.props:
+        * WebCore.vcxproj/copyForwardingHeaders.cmd:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/objc/DOMInternal.mm:
+        * bridge/objc/objc_instance.mm:
+        * platform/audio/ios/MediaSessionManagerIOS.mm:
+        * platform/cocoa/DisplaySleepDisablerCocoa.cpp:
+        * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+        * platform/graphics/SimpleFontData.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        * platform/graphics/cg/BitmapImageCG.cpp:
+        * platform/graphics/cg/ColorCG.cpp:
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        * platform/graphics/cg/ImageSourceCG.cpp:
+        * platform/graphics/cg/PDFDocumentImage.cpp:
+        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+        * platform/graphics/ios/FontCacheIOS.mm:
+        * platform/graphics/ios/FontServicesIOS.mm:
+        * platform/graphics/ios/SimpleFontDataIOS.mm:
+        * platform/graphics/mac/FontMac.mm:
+        * platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
+        * platform/graphics/mac/MediaPlayerProxy.h:
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        * platform/ios/LegacyTileCache.mm:
+        * platform/ios/LegacyTileGrid.mm:
+        * platform/ios/LegacyTileGridTile.mm:
+        * platform/ios/PlatformEventFactoryIOS.mm:
+        * platform/ios/PlatformScreenIOS.mm:
+        * platform/ios/WebEvent.mm:
+        * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+        * platform/ios/wak/WAKAppKitStubs.h:
+        * platform/ios/wak/WAKView.h:
+        * platform/ios/wak/WKGraphics.h:
+        * platform/ios/wak/WKGraphics.mm:
+        * platform/ios/wak/WebCoreThread.mm:
+        * platform/network/ios/QuickLook.mm:
+        * platform/spi/ca/CALayerSPI.h: Added.
+        * platform/spi/ca/CATiledLayerSPI.h: Added.
+        * platform/spi/cf/CFLocaleSPI.h: Modified to use EXTERN_C.
+        * platform/spi/cf/CFNetworkConnectionCacheSPI.h: Ditto. Also changed header visibility from private to project.
+        * platform/spi/cf/CFURLRequestSPI.h: Ditto. Also modified to unconditionally include header <CoreFoundation/CFBase.h>.
+        * platform/spi/cg/CGColorTransformSPI.h: Added.
+        * platform/spi/cg/CGContextSPI.h: Added.
+        * platform/spi/cg/CGFloatSPI.h: Added.
+        * platform/spi/cg/CGFontGlyphSupportSPI.h: Added.
+        * platform/spi/cg/CGFontInfoSPI.h: Added.
+        * platform/spi/cg/CGFontRenderingSPI.h: Added.
+        * platform/spi/cg/CGFontUnicodeSupportSPI.h: Added.
+        * platform/spi/cg/CGImageSPI.h: Added.
+        * platform/spi/cg/CGSRegionSPI.h: Added.
+        * platform/spi/cocoa/DispatchSPI.h: Added.
+        * platform/spi/cocoa/IOPMLibSPI.h: Added.
+        * platform/spi/cocoa/MachVMSPI.h: Added.
+        * platform/spi/cocoa/NSFileManagerSPI.h: Added.
+        * platform/spi/cocoa/NSGeometrySPI.h: Added.
+        * platform/spi/cocoa/NSPointerFunctionsSPI.h: Added.
+        * platform/spi/cocoa/dyldSPI.h: Added.
+        * platform/spi/ios/AVPlayerControllerSPI.h: Added.
+        * platform/spi/ios/AVPlayerViewControllerSPI.h: Added.
+        * platform/spi/ios/AVValueTimingSPI.h: Added.
+        * platform/spi/ios/AVVideoLayerSPI.h: Added.
+        * platform/spi/ios/CTFontDescriptorSPI.h: Added.
+        * platform/spi/ios/CTFontSPI.h: Added.
+        * platform/spi/ios/CUICatalogSPI.h: Added.
+        * platform/spi/ios/CUIStyleEffectConfigurationSPI.h: Added.
+        * platform/spi/ios/MPAVRoutingControllerSPI.h: Added.
+        * platform/spi/ios/MobileGestaltSPI.h: Added.
+        * platform/spi/ios/QLPreviewConverterSPI.h: Added.
+        * platform/spi/ios/QuickLookSPI.h: Added.
+        * rendering/RenderThemeIOS.mm:
+
 2014-09-17  Gavin Barraclough  <barraclough@apple.com>
 
         DOM timer throttling for hidden plugins
index 917c688..e290284 100644 (file)
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </CustomBuildStep>
+    <ClInclude Include="..\platform\spi\cg\CGFontRenderingSPI.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="..\platform\sql\SQLiteDatabase.h" />
     <ClInclude Include="..\platform\sql\SQLiteDatabaseTracker.h" />
     <ClInclude Include="..\platform\sql\SQLiteDatabaseTrackerClient.h" />
index 6d14988..73c754a 100644 (file)
     <Filter Include="platform\network\curl">
       <UniqueIdentifier>{b5903214-cbb2-4fad-9ff0-3930aaa733f6}</UniqueIdentifier>
     </Filter>
+    <Filter Include="platform\spi">
+      <UniqueIdentifier>{247a4ea4-dcb5-4dd0-9d0d-bb13ecb08d58}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="platform\spi\cg">
+      <UniqueIdentifier>{a2e9a1a3-c5c3-4331-ab01-0d12fea979e7}</UniqueIdentifier>
+    </Filter>
     <Filter Include="platform\sql">
       <UniqueIdentifier>{f935d93c-734f-4f61-a31f-c3b960fc5aff}</UniqueIdentifier>
     </Filter>
     <ClInclude Include="..\platform\network\cf\LoaderRunLoopCF.h">
       <Filter>platform\network\cf</Filter>
     </ClInclude>
+    <ClInclude Include="..\platform\spi\cg\CGFontRenderingSPI.h">
+      <Filter>platform\spi\cg</Filter>
+    </ClInclude>
     <ClInclude Include="..\platform\sql\SQLiteDatabase.h">
       <Filter>platform\sql</Filter>
     </ClInclude>
index 8b8d4e5..106251b 100644 (file)
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\platform\graphics\cg;$(ProjectDir)..\svg\graphics\cg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\platform\graphics\cg;$(ProjectDir)..\platform\spi\cg;$(ProjectDir)..\svg\graphics\cg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DISABLE_COREIMAGE;DISABLE_FRONTEND;DISABLE_IOSURFACE;DISABLE_RENDERSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
index fbf69f1..9baad7d 100644 (file)
@@ -65,6 +65,7 @@ xcopy /y /d "%ProjectDir%..\platform\text\transcoder\*.h" "%CONFIGURATIONBUILDDI
 xcopy /y /d "%ProjectDir%..\platform\win\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\platform\network\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\platform\network\%2\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
+xcopy /y /d "%ProjectDir%..\platform\spi\cg\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\platform\sql\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\platform\cairo\cairo\src\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\bindings\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
index 5b4d38e..8ae6ba2 100644 (file)
                CDFC360718CA696C0026E56F /* RemoteCommandListenerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDFC360218CA61630026E56F /* RemoteCommandListenerIOS.mm */; };
                CE057FA51220731100A476D5 /* DocumentMarkerController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE057FA31220731100A476D5 /* DocumentMarkerController.cpp */; };
                CE057FA61220731100A476D5 /* DocumentMarkerController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE057FA41220731100A476D5 /* DocumentMarkerController.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CE08AC5619C202B700644843 /* MachVMSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE08AC5519C202AF00644843 /* MachVMSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE08C3D1152B599A0021B8C2 /* AlternativeTextController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE08C3CF152B599A0021B8C2 /* AlternativeTextController.cpp */; };
                CE08C3D2152B599A0021B8C2 /* AlternativeTextController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE08C3D0152B599A0021B8C2 /* AlternativeTextController.h */; settings = {ATTRIBUTES = (); }; };
+               CE4F6D3419B774F600BFC64A /* CALayerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D3219B774F600BFC64A /* CALayerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CE4F6D4419B7751200BFC64A /* CGFloatSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D3A19B7751200BFC64A /* CGFloatSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CE4F6D6419B775F800BFC64A /* DispatchSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D5F19B775F800BFC64A /* DispatchSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CE4F6D6719B775F800BFC64A /* NSGeometrySPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D6219B775F800BFC64A /* NSGeometrySPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CE650DAC19BAD13C00613518 /* CTFontDescriptorSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D4C19B7757B00BFC64A /* CTFontDescriptorSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CE650DAD19BAD14400613518 /* CTFontSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D4D19B7757B00BFC64A /* CTFontSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CE650DAE19BAD15800613518 /* MPAVRoutingControllerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D5319B7757B00BFC64A /* MPAVRoutingControllerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CE650DAF19BAD18400613518 /* MobileGestaltSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D5219B7757B00BFC64A /* MobileGestaltSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CE650DB019BAD1B400613518 /* NSFileManagerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D6119B775F800BFC64A /* NSFileManagerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CE650DB119BB603E00613518 /* CGContextSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D3919B7751200BFC64A /* CGContextSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CE650DB319BB60DD00613518 /* CGFontRenderingSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D3D19B7751200BFC64A /* CGFontRenderingSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE7B2DB31586ABAD0098B3FA /* AlternativeTextUIController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE7B2DAF1586ABAD0098B3FA /* AlternativeTextUIController.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE7B2DB41586ABAD0098B3FA /* AlternativeTextUIController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CE7B2DB01586ABAD0098B3FA /* AlternativeTextUIController.mm */; };
                CE7B2DB51586ABAD0098B3FA /* TextAlternativeWithRange.h in Headers */ = {isa = PBXBuildFile; fileRef = CE7B2DB11586ABAD0098B3FA /* TextAlternativeWithRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE7B2DB61586ABAD0098B3FA /* TextAlternativeWithRange.mm in Sources */ = {isa = PBXBuildFile; fileRef = CE7B2DB21586ABAD0098B3FA /* TextAlternativeWithRange.mm */; };
-               CE8245F019B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE8245F219B671D500AC0122 /* CFURLRequestSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE8245F119B671D500AC0122 /* CFURLRequestSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE95208A1811B475007A5392 /* WebSafeIncrementalSweeperIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = C2C4CB1D161A131200D214DA /* WebSafeIncrementalSweeperIOS.h */; };
+               CEAA693A19C35BC400C4F7BF /* CATiledLayerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D3319B774F600BFC64A /* CATiledLayerSPI.h */; };
+               CEAA693B19C35C0F00C4F7BF /* CFLocaleSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 65086DA719AC1719009AF46B /* CFLocaleSPI.h */; };
+               CEAA693C19C35C1300C4F7BF /* CFNetworkConnectionCacheSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */; };
+               CEAA693D19C35C1B00C4F7BF /* CGColorTransformSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D3719B7751200BFC64A /* CGColorTransformSPI.h */; };
+               CEAA693E19C35C2200C4F7BF /* CGFontGlyphSupportSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D3B19B7751200BFC64A /* CGFontGlyphSupportSPI.h */; };
+               CEAA693F19C35C2500C4F7BF /* CGFontInfoSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D3C19B7751200BFC64A /* CGFontInfoSPI.h */; };
+               CEAA694019C35C2A00C4F7BF /* CGFontUnicodeSupportSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D3E19B7751200BFC64A /* CGFontUnicodeSupportSPI.h */; };
+               CEAA694119C35C2C00C4F7BF /* CGImageSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D3F19B7751200BFC64A /* CGImageSPI.h */; };
+               CEAA694219C35C2F00C4F7BF /* CGSRegionSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D4019B7751200BFC64A /* CGSRegionSPI.h */; };
+               CEAA694319C35C3800C4F7BF /* dyldSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D6019B775F800BFC64A /* dyldSPI.h */; };
+               CEAA694419C35C3B00C4F7BF /* IOPMLibSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D6919B7854E00BFC64A /* IOPMLibSPI.h */; };
+               CEAA694519C35C4700C4F7BF /* NSPointerFunctionsSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D6319B775F800BFC64A /* NSPointerFunctionsSPI.h */; };
+               CEAA694619C35C4F00C4F7BF /* AVPlayerControllerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D2919B774D500BFC64A /* AVPlayerControllerSPI.h */; };
+               CEAA694719C35C5100C4F7BF /* AVPlayerViewControllerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D2A19B774D500BFC64A /* AVPlayerViewControllerSPI.h */; };
+               CEAA694819C35C5300C4F7BF /* AVValueTimingSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D2B19B774D500BFC64A /* AVValueTimingSPI.h */; };
+               CEAA694919C35C5600C4F7BF /* AVVideoLayerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D2C19B774D500BFC64A /* AVVideoLayerSPI.h */; };
+               CEAA694A19C35C5B00C4F7BF /* CUICatalogSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D4F19B7757B00BFC64A /* CUICatalogSPI.h */; };
+               CEAA694B19C35C5E00C4F7BF /* CUIStyleEffectConfigurationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D5019B7757B00BFC64A /* CUIStyleEffectConfigurationSPI.h */; };
+               CEAA694C19C35C6300C4F7BF /* QLPreviewConverterSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D5519B7757B00BFC64A /* QLPreviewConverterSPI.h */; };
+               CEAA694D19C35C6500C4F7BF /* QuickLookSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4F6D5619B7757B00BFC64A /* QuickLookSPI.h */; };
                CECADFC6153778FF00E37068 /* DictationAlternative.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CECADFC2153778FF00E37068 /* DictationAlternative.cpp */; };
                CECADFC7153778FF00E37068 /* DictationAlternative.h in Headers */ = {isa = PBXBuildFile; fileRef = CECADFC3153778FF00E37068 /* DictationAlternative.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CECADFC8153778FF00E37068 /* DictationCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CECADFC4153778FF00E37068 /* DictationCommand.cpp */; };
                CDFC360418CA61C20026E56F /* RemoteCommandListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteCommandListener.h; sourceTree = "<group>"; };
                CE057FA31220731100A476D5 /* DocumentMarkerController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentMarkerController.cpp; sourceTree = "<group>"; };
                CE057FA41220731100A476D5 /* DocumentMarkerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentMarkerController.h; sourceTree = "<group>"; };
+               CE08AC5519C202AF00644843 /* MachVMSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MachVMSPI.h; sourceTree = "<group>"; };
                CE08C3CF152B599A0021B8C2 /* AlternativeTextController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AlternativeTextController.cpp; sourceTree = "<group>"; };
                CE08C3D0152B599A0021B8C2 /* AlternativeTextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlternativeTextController.h; sourceTree = "<group>"; };
+               CE4F6D2919B774D500BFC64A /* AVPlayerControllerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVPlayerControllerSPI.h; sourceTree = "<group>"; };
+               CE4F6D2A19B774D500BFC64A /* AVPlayerViewControllerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVPlayerViewControllerSPI.h; sourceTree = "<group>"; };
+               CE4F6D2B19B774D500BFC64A /* AVValueTimingSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVValueTimingSPI.h; sourceTree = "<group>"; };
+               CE4F6D2C19B774D500BFC64A /* AVVideoLayerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVVideoLayerSPI.h; sourceTree = "<group>"; };
+               CE4F6D3219B774F600BFC64A /* CALayerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CALayerSPI.h; sourceTree = "<group>"; };
+               CE4F6D3319B774F600BFC64A /* CATiledLayerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CATiledLayerSPI.h; sourceTree = "<group>"; };
+               CE4F6D3719B7751200BFC64A /* CGColorTransformSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGColorTransformSPI.h; sourceTree = "<group>"; };
+               CE4F6D3919B7751200BFC64A /* CGContextSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGContextSPI.h; sourceTree = "<group>"; };
+               CE4F6D3A19B7751200BFC64A /* CGFloatSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGFloatSPI.h; sourceTree = "<group>"; };
+               CE4F6D3B19B7751200BFC64A /* CGFontGlyphSupportSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGFontGlyphSupportSPI.h; sourceTree = "<group>"; };
+               CE4F6D3C19B7751200BFC64A /* CGFontInfoSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGFontInfoSPI.h; sourceTree = "<group>"; };
+               CE4F6D3D19B7751200BFC64A /* CGFontRenderingSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGFontRenderingSPI.h; sourceTree = "<group>"; };
+               CE4F6D3E19B7751200BFC64A /* CGFontUnicodeSupportSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGFontUnicodeSupportSPI.h; sourceTree = "<group>"; };
+               CE4F6D3F19B7751200BFC64A /* CGImageSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGImageSPI.h; sourceTree = "<group>"; };
+               CE4F6D4019B7751200BFC64A /* CGSRegionSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGSRegionSPI.h; sourceTree = "<group>"; };
+               CE4F6D4C19B7757B00BFC64A /* CTFontDescriptorSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CTFontDescriptorSPI.h; sourceTree = "<group>"; };
+               CE4F6D4D19B7757B00BFC64A /* CTFontSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CTFontSPI.h; sourceTree = "<group>"; };
+               CE4F6D4F19B7757B00BFC64A /* CUICatalogSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CUICatalogSPI.h; sourceTree = "<group>"; };
+               CE4F6D5019B7757B00BFC64A /* CUIStyleEffectConfigurationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CUIStyleEffectConfigurationSPI.h; sourceTree = "<group>"; };
+               CE4F6D5219B7757B00BFC64A /* MobileGestaltSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobileGestaltSPI.h; sourceTree = "<group>"; };
+               CE4F6D5319B7757B00BFC64A /* MPAVRoutingControllerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAVRoutingControllerSPI.h; sourceTree = "<group>"; };
+               CE4F6D5519B7757B00BFC64A /* QLPreviewConverterSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QLPreviewConverterSPI.h; sourceTree = "<group>"; };
+               CE4F6D5619B7757B00BFC64A /* QuickLookSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookSPI.h; sourceTree = "<group>"; };
+               CE4F6D5F19B775F800BFC64A /* DispatchSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DispatchSPI.h; sourceTree = "<group>"; };
+               CE4F6D6019B775F800BFC64A /* dyldSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dyldSPI.h; sourceTree = "<group>"; };
+               CE4F6D6119B775F800BFC64A /* NSFileManagerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSFileManagerSPI.h; sourceTree = "<group>"; };
+               CE4F6D6219B775F800BFC64A /* NSGeometrySPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSGeometrySPI.h; sourceTree = "<group>"; };
+               CE4F6D6319B775F800BFC64A /* NSPointerFunctionsSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSPointerFunctionsSPI.h; sourceTree = "<group>"; };
+               CE4F6D6919B7854E00BFC64A /* IOPMLibSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOPMLibSPI.h; sourceTree = "<group>"; };
                CE5CB1B314EDAB6F00BB2795 /* EventSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventSender.h; sourceTree = "<group>"; };
                CE6D89294C7AACE0AD89B3DD /* MathMLMencloseElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLMencloseElement.h; sourceTree = "<group>"; };
                CE7B2DAF1586ABAD0098B3FA /* AlternativeTextUIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AlternativeTextUIController.h; path = mac/AlternativeTextUIController.h; sourceTree = "<group>"; };
                653EF83619A043AE0052202C /* spi */ = {
                        isa = PBXGroup;
                        children = (
+                               CE4F6D3119B774F600BFC64A /* ca */,
                                65086DA619AC1719009AF46B /* cf */,
+                               CE4F6D3619B7751200BFC64A /* cg */,
                                653EF83719A043AE0052202C /* cocoa */,
+                               CE4F6D5119B7757B00BFC64A /* ios */,
                        );
                        path = spi;
                        sourceTree = "<group>";
                653EF83719A043AE0052202C /* cocoa */ = {
                        isa = PBXGroup;
                        children = (
+                               CE4F6D5F19B775F800BFC64A /* DispatchSPI.h */,
+                               CE4F6D6019B775F800BFC64A /* dyldSPI.h */,
+                               CE4F6D6919B7854E00BFC64A /* IOPMLibSPI.h */,
+                               CE08AC5519C202AF00644843 /* MachVMSPI.h */,
+                               CE4F6D6119B775F800BFC64A /* NSFileManagerSPI.h */,
+                               CE4F6D6219B775F800BFC64A /* NSGeometrySPI.h */,
+                               CE4F6D6319B775F800BFC64A /* NSPointerFunctionsSPI.h */,
                                653EF83819A043AE0052202C /* NSURLFileTypeMappingsSPI.h */,
                        );
                        path = cocoa;
                        path = ios;
                        sourceTree = "<group>";
                };
+               CE4F6D3119B774F600BFC64A /* ca */ = {
+                       isa = PBXGroup;
+                       children = (
+                               CE4F6D3219B774F600BFC64A /* CALayerSPI.h */,
+                               CE4F6D3319B774F600BFC64A /* CATiledLayerSPI.h */,
+                       );
+                       path = ca;
+                       sourceTree = "<group>";
+               };
+               CE4F6D3619B7751200BFC64A /* cg */ = {
+                       isa = PBXGroup;
+                       children = (
+                               CE4F6D3719B7751200BFC64A /* CGColorTransformSPI.h */,
+                               CE4F6D3919B7751200BFC64A /* CGContextSPI.h */,
+                               CE4F6D3A19B7751200BFC64A /* CGFloatSPI.h */,
+                               CE4F6D3B19B7751200BFC64A /* CGFontGlyphSupportSPI.h */,
+                               CE4F6D3C19B7751200BFC64A /* CGFontInfoSPI.h */,
+                               CE4F6D3D19B7751200BFC64A /* CGFontRenderingSPI.h */,
+                               CE4F6D3E19B7751200BFC64A /* CGFontUnicodeSupportSPI.h */,
+                               CE4F6D3F19B7751200BFC64A /* CGImageSPI.h */,
+                               CE4F6D4019B7751200BFC64A /* CGSRegionSPI.h */,
+                       );
+                       path = cg;
+                       sourceTree = "<group>";
+               };
+               CE4F6D5119B7757B00BFC64A /* ios */ = {
+                       isa = PBXGroup;
+                       children = (
+                               CE4F6D2919B774D500BFC64A /* AVPlayerControllerSPI.h */,
+                               CE4F6D2A19B774D500BFC64A /* AVPlayerViewControllerSPI.h */,
+                               CE4F6D2B19B774D500BFC64A /* AVValueTimingSPI.h */,
+                               CE4F6D2C19B774D500BFC64A /* AVVideoLayerSPI.h */,
+                               CE4F6D4C19B7757B00BFC64A /* CTFontDescriptorSPI.h */,
+                               CE4F6D4D19B7757B00BFC64A /* CTFontSPI.h */,
+                               CE4F6D4F19B7757B00BFC64A /* CUICatalogSPI.h */,
+                               CE4F6D5019B7757B00BFC64A /* CUIStyleEffectConfigurationSPI.h */,
+                               CE4F6D5219B7757B00BFC64A /* MobileGestaltSPI.h */,
+                               CE4F6D5319B7757B00BFC64A /* MPAVRoutingControllerSPI.h */,
+                               CE4F6D5519B7757B00BFC64A /* QLPreviewConverterSPI.h */,
+                               CE4F6D5619B7757B00BFC64A /* QuickLookSPI.h */,
+                       );
+                       path = ios;
+                       sourceTree = "<group>";
+               };
                DF9AFD6F13FC31B00015FEB7 /* objc */ = {
                        isa = PBXGroup;
                        children = (
                                CD54A763180F9F7000B076C9 /* AudioTrackPrivateMediaSourceAVFObjC.h in Headers */,
                                FD31608B12B026F700C1A359 /* AudioUtilities.h in Headers */,
                                7EE6846012D26E3800E79415 /* AuthenticationCF.h in Headers */,
+                               CEAA693C19C35C1300C4F7BF /* CFNetworkConnectionCacheSPI.h in Headers */,
                                7EE6846112D26E3800E79415 /* AuthenticationChallenge.h in Headers */,
                                934F713A0D5A6F1000018D69 /* AuthenticationChallengeBase.h in Headers */,
                                E124748410AA161D00B79493 /* AuthenticationClient.h in Headers */,
                                BCB16C280979C3BD00467741 /* CachedXSLStyleSheet.h in Headers */,
                                93F1995008245E59001E9ABC /* CachePolicy.h in Headers */,
                                518F5002194CAC3A0081BAAE /* JSGamepad.h in Headers */,
+                               CE4F6D3419B774F600BFC64A /* CALayerSPI.h in Headers */,
                                49AE2D97134EE5F90072920A /* CalculationValue.h in Headers */,
                                B1D5ECB5134B58DA0087C78F /* CallbackFunction.h in Headers */,
                                6E4E91AD10F7FB3100A2779C /* CanvasContextAttributes.h in Headers */,
                                6550B69E099DF0270090D781 /* CDATASection.h in Headers */,
                                CDDD571518B57A8200A94FCB /* CDMSession.h in Headers */,
                                5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */,
-                               CE8245F019B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h in Headers */,
                                E1A8E56717552B2A007488E7 /* CFURLExtras.h in Headers */,
                                CE8245F219B671D500AC0122 /* CFURLRequestSPI.h in Headers */,
+                               CE4F6D4419B7751200BFC64A /* CGFloatSPI.h in Headers */,
                                FE36FD1516C7826500F887C1 /* ChangeVersionData.h in Headers */,
                                97BC69DD1505F076001B74AC /* ChangeVersionWrapper.h in Headers */,
                                FD315FFF12B0267600C1A359 /* ChannelMergerNode.h in Headers */,
                                A80E6CED0A1989CA007FB8C5 /* CSSFontValue.h in Headers */,
                                BC02A63C0E09A9CF004B6D2B /* CSSFunctionValue.h in Headers */,
                                7AF9B20318CFB2DF00C64BEF /* VTTRegion.h in Headers */,
+                               CE08AC5619C202B700644843 /* MachVMSPI.h in Headers */,
                                BC53C6920DA591140021EB5D /* CSSGradientValue.h in Headers */,
                                650F53DC09D15DDA00C9B0C8 /* CSSGrammar.h in Headers */,
                                CD3E252418046BCD00E27F56 /* CSSGridTemplateAreasValue.h in Headers */,
                                D0BD4F5D1408850F006839B6 /* DictationCommandIOS.h in Headers */,
                                316023F01532C40C00D50FF4 /* Dictionary.h in Headers */,
                                FDAF19991513D131008DB0C3 /* DirectConvolver.h in Headers */,
+                               CE4F6D6419B775F800BFC64A /* DispatchSPI.h in Headers */,
                                49AF2D6914435D050016A784 /* DisplayRefreshMonitor.h in Headers */,
                                5D8C4DC01428222C0026CE72 /* DisplaySleepDisablerCocoa.h in Headers */,
                                FD31609112B026F700C1A359 /* Distance.h in Headers */,
                                BC1A37AD097C715F0019F3D8 /* DOM.h in Headers */,
                                8538F0190AD718D8006A81D1 /* DOMAbstractView.h in Headers */,
                                BC99812E0DBE807A008CE9EF /* DOMAbstractViewFrame.h in Headers */,
+                               CE650DB019BAD1B400613518 /* NSFileManagerSPI.h in Headers */,
                                8538F01B0AD718D8006A81D1 /* DOMAbstractViewInternal.h in Headers */,
                                1A8F6BC30DB55CDC001DB794 /* DOMApplicationCache.h in Headers */,
                                85D389B20A991A7F00282145 /* DOMAttr.h in Headers */,
                                85989DCC0ACC8BBD00A0BC51 /* DOMKeyboardEventInternal.h in Headers */,
                                850656FE0AAB4763002D15C0 /* DOMMediaList.h in Headers */,
                                85E711D10AC5D5350053270F /* DOMMediaListInternal.h in Headers */,
+                               CE650DAE19BAD15800613518 /* MPAVRoutingControllerSPI.h in Headers */,
                                75793ED30D0CE85B007FC0AC /* DOMMessageEvent.h in Headers */,
                                75793ED50D0CE85B007FC0AC /* DOMMessageEventInternal.h in Headers */,
                                E1ACAF4D0E791AAF0087D12B /* DOMMessagePort.h in Headers */,
                                51D719B7181106E00016DC51 /* DOMWindowIndexedDatabase.h in Headers */,
                                97B38E27151C4271004622E9 /* DOMWindowNotifications.h in Headers */,
                                97D2AD0414B823A60093DF32 /* DOMWindowProperty.h in Headers */,
+                               CEAA694319C35C3800C4F7BF /* dyldSPI.h in Headers */,
                                89F60B11157F686E0075E157 /* DOMWindowQuota.h in Headers */,
                                AA2A5AD616A4861600975A25 /* DOMWindowSpeechSynthesis.h in Headers */,
                                A8CCBB49151F831600AB7CE9 /* DOMWindowWebDatabase.h in Headers */,
                                BC073BAA0C399B1F000F5979 /* FloatConversion.h in Headers */,
                                9A528E8417D7F52F00AA9518 /* FloatingObjects.h in Headers */,
                                B27535690B053814002CE64F /* FloatPoint.h in Headers */,
+                               CEAA694719C35C5100C4F7BF /* AVPlayerViewControllerSPI.h in Headers */,
                                B2E27CA00B0F2B0900F17C7B /* FloatPoint3D.h in Headers */,
                                6EC480A216EA638A00A48DCB /* FloatPolygon.h in Headers */,
                                0FD723820EC8BD9300CA5DD7 /* FloatQuad.h in Headers */,
                                A871DC1F0A15205700B12A68 /* HTMLBaseElement.h in Headers */,
                                A8DF3FD2097FA0FC0052981B /* HTMLBaseFontElement.h in Headers */,
                                9B24DE8E15194B9500C59C27 /* HTMLBDIElement.h in Headers */,
+                               CEAA694919C35C5600C4F7BF /* AVVideoLayerSPI.h in Headers */,
                                A871DE2C0A152AC800B12A68 /* HTMLBodyElement.h in Headers */,
                                A8CFF7AA0A156978000A4234 /* HTMLBRElement.h in Headers */,
                                CD7DBB2918CA19C600C11066 /* CSSGridLineNamesValue.h in Headers */,
                                A8EA79F70A1916DF00A8EF5F /* HTMLDListElement.h in Headers */,
                                CDC734151977896D0046BFC5 /* CARingBuffer.h in Headers */,
                                93F198E508245E59001E9ABC /* HTMLDocument.h in Headers */,
+                               CEAA693A19C35BC400C4F7BF /* CATiledLayerSPI.h in Headers */,
                                977B3867122883E900B81FF8 /* HTMLDocumentParser.h in Headers */,
                                93309DE8099E64920056E581 /* htmlediting.h in Headers */,
                                93F198E608245E59001E9ABC /* HTMLElement.h in Headers */,
                                8AB4BC77126FDB7100DEB727 /* IgnoreDestructiveWriteCountIncrementer.h in Headers */,
                                B27535700B053814002CE64F /* Image.h in Headers */,
                                B2A10B920B3818BD00099AA4 /* ImageBuffer.h in Headers */,
+                               CEAA694C19C35C6300C4F7BF /* QLPreviewConverterSPI.h in Headers */,
                                1C21E57D183ED1FF001C289D /* IOSurfacePool.h in Headers */,
                                22BD9F7F1353625C009BD102 /* ImageBufferData.h in Headers */,
                                22BD9F81135364FE009BD102 /* ImageBufferDataCG.h in Headers */,
                                20D629271253690B00081543 /* InspectorInstrumentation.h in Headers */,
                                A5840E1D187B74D500843B10 /* InspectorInstrumentationCookie.h in Headers */,
                                71B1E125164048F700B1880A /* InspectorLayerTreeAgent.h in Headers */,
+                               CEAA694119C35C2C00C4F7BF /* CGImageSPI.h in Headers */,
                                504AACCE1834455900E3D9BC /* InspectorNodeFinder.h in Headers */,
                                0F03C0751884805500A5F8CA /* InspectorOverlay.h in Headers */,
                                4F6FDD651341DEDD001F8EE3 /* InspectorPageAgent.h in Headers */,
                                070756D414239A4F00414161 /* JSHTMLTrackElement.h in Headers */,
                                1A85B2110A1B258700D8C87C /* JSHTMLUListElement.h in Headers */,
                                6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */,
+                               CEAA694819C35C5300C4F7BF /* AVValueTimingSPI.h in Headers */,
                                E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */,
                                C585A67D11D4FB08004C3E4B /* JSIDBAny.h in Headers */,
                                81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */,
                                E1FF8F65180745D800132674 /* JSSubtleCrypto.h in Headers */,
                                B20111080AB7740500DB0E68 /* JSSVGAElement.h in Headers */,
                                24D9129213CA951E00D21915 /* JSSVGAltGlyphDefElement.h in Headers */,
+                               CEAA694019C35C2A00C4F7BF /* CGFontUnicodeSupportSPI.h in Headers */,
                                F47A5E3E195B8C8A00483100 /* StyleScrollSnapPoints.h in Headers */,
                                07AC47021952102100EE9723 /* ISOVTTCue.h in Headers */,
+                               CEAA694B19C35C5E00C4F7BF /* CUIStyleEffectConfigurationSPI.h in Headers */,
                                6515EC920D9723FF0063D49A /* JSSVGAltGlyphElement.h in Headers */,
                                24D9129613CA956100D21915 /* JSSVGAltGlyphItemElement.h in Headers */,
                                B222F6990AB771950022EFAD /* JSSVGAngle.h in Headers */,
                                B2FA3DD90AB75A6F000E5AC4 /* JSSVGPathSegLinetoVerticalRel.h in Headers */,
                                B2FA3DDB0AB75A6F000E5AC4 /* JSSVGPathSegList.h in Headers */,
                                B2FA3DDD0AB75A6F000E5AC4 /* JSSVGPathSegMovetoAbs.h in Headers */,
+                               CE650DAF19BAD18400613518 /* MobileGestaltSPI.h in Headers */,
                                B2FA3DDF0AB75A6F000E5AC4 /* JSSVGPathSegMovetoRel.h in Headers */,
                                B2FA3DE10AB75A6F000E5AC4 /* JSSVGPatternElement.h in Headers */,
                                8542A7950AE5C94100DF58DF /* JSSVGPoint.h in Headers */,
                                BC7FA6210D1F0CBD00DB22A9 /* LiveNodeList.h in Headers */,
                                9759E94914EF1D490026A2DD /* LoadableTextTrack.h in Headers */,
                                656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */,
+                               CE650DB119BB603E00613518 /* CGContextSPI.h in Headers */,
                                7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */,
                                51E6821016387302003BBF3C /* LoaderStrategy.h in Headers */,
                                06E81ED70AB5D5E900C87837 /* LocalCurrentGraphicsContext.h in Headers */,
                                076306D317E1478D005A7C4E /* MediaStreamTrackSourcesRequest.h in Headers */,
                                076306E317E22A43005A7C4E /* MediaStreamTrackSourcesRequestClient.h in Headers */,
                                CD641EC01819B36000EE4C41 /* MediaTimeAVFoundation.h in Headers */,
+                               CEAA693F19C35C2500C4F7BF /* CGFontInfoSPI.h in Headers */,
                                0705852117FDC140005F2BCB /* MediaTrackConstraint.h in Headers */,
                                0705852417FDC140005F2BCB /* MediaTrackConstraints.h in Headers */,
                                0705852917FDE02C005F2BCB /* MediaTrackConstraintSet.h in Headers */,
                                D6E528A4149A926D00EFE1F3 /* MutationObserverInterestGroup.h in Headers */,
                                D6E276B014637455001D280A /* MutationObserverRegistration.h in Headers */,
                                C6F08FBD1430FE8F00685849 /* MutationRecord.h in Headers */,
+                               CE4F6D6719B775F800BFC64A /* NSGeometrySPI.h in Headers */,
                                52B6C9C615E3F4DF00690B05 /* NamedFlowCollection.h in Headers */,
                                A81872230977D3C0005826D9 /* NamedNodeMap.h in Headers */,
                                A818721E0977D3C0005826D9 /* NameNodeList.h in Headers */,
                                BCEA4864097D93020094C9E4 /* RenderLineBreak.h in Headers */,
                                ABB5419F0ACDDFE4002820EB /* RenderListBox.h in Headers */,
                                A8EA7A520A191A5200A8EF5F /* RenderListItem.h in Headers */,
+                               CE650DAC19BAD13C00613518 /* CTFontDescriptorSPI.h in Headers */,
                                3792917E1987678F00F4B661 /* CredentialCocoa.h in Headers */,
                                A8EA7A500A191A5200A8EF5F /* RenderListMarker.h in Headers */,
                                0F56028F0E4B76580065B038 /* RenderMarquee.h in Headers */,
                                A8DF4AEE0980C42C0052981B /* RenderTableRow.h in Headers */,
                                76FB9FF919A73E3A00420562 /* JSAutocompleteErrorEvent.h in Headers */,
                                A8DF4AEF0980C42C0052981B /* RenderTableSection.h in Headers */,
+                               CE650DAD19BAD14400613518 /* CTFontSPI.h in Headers */,
                                BCEA488C097D93020094C9E4 /* RenderText.h in Headers */,
                                AB67D1A9097F3AE300F9392E /* RenderTextControl.h in Headers */,
                                083DAEA70F01A7FB00342754 /* RenderTextControlMultiLine.h in Headers */,
                                BC2272BD0E82EAAE00E7F975 /* StyleRareNonInheritedData.h in Headers */,
                                BC2272870E82E70700E7F975 /* StyleReflection.h in Headers */,
                                E4D58EB517B4DBDC00CBDCA8 /* StyleResolveForDocument.h in Headers */,
+                               CEAA694519C35C4700C4F7BF /* NSPointerFunctionsSPI.h in Headers */,
                                E139866415478474001E3F65 /* StyleResolver.h in Headers */,
                                E4DEAA1817A93DC3000E0430 /* StyleResolveTree.h in Headers */,
                                E4BBED4D14FCDBA1003F0B98 /* StyleRule.h in Headers */,
                                087558C613B4A57D00F49307 /* SurrogatePairAwareTextIterator.h in Headers */,
                                62C1217D11AB9E77003C462C /* SuspendableTimer.h in Headers */,
                                B22279740D00BF220071B782 /* SVGAElement.h in Headers */,
+                               CEAA693D19C35C1B00C4F7BF /* CGColorTransformSPI.h in Headers */,
                                24D912B113CA9A1F00D21915 /* SVGAltGlyphDefElement.h in Headers */,
                                65653F2E0D9727D200CA9723 /* SVGAltGlyphElement.h in Headers */,
                                24D912B813CA9A6900D21915 /* SVGAltGlyphItemElement.h in Headers */,
                                B22279B70D00BF220071B782 /* SVGElement.h in Headers */,
                                656581FE09D1508D000E61D7 /* SVGElementFactory.h in Headers */,
                                B22279BA0D00BF220071B782 /* SVGElementInstance.h in Headers */,
+                               CEAA694A19C35C5B00C4F7BF /* CUICatalogSPI.h in Headers */,
                                B22279BD0D00BF220071B782 /* SVGElementInstanceList.h in Headers */,
                                081AA8DA1111237E002AB06E /* SVGElementRareData.h in Headers */,
                                B562DB6117D3CD660010AF96 /* SVGElementTypeHelpers.h in Headers */,
                                83C1D425178D5AB400141E68 /* SVGPathSegArcAbs.h in Headers */,
                                83C1D426178D5AB400141E68 /* SVGPathSegArcRel.h in Headers */,
                                B2227A620D00BF220071B782 /* SVGPathSegClosePath.h in Headers */,
+                               CEAA693B19C35C0F00C4F7BF /* CFLocaleSPI.h in Headers */,
                                B2227A650D00BF220071B782 /* SVGPathSegCurvetoCubic.h in Headers */,
                                83C1D427178D5AB400141E68 /* SVGPathSegCurvetoCubicAbs.h in Headers */,
                                83C1D428178D5AB400141E68 /* SVGPathSegCurvetoCubicRel.h in Headers */,
                                7CDEEE1E197610D700E352CD /* ViewStateChangeObserver.h in Headers */,
                                B2227AC10D00BF220071B782 /* SVGSymbolElement.h in Headers */,
                                B2227AC50D00BF220071B782 /* SVGTests.h in Headers */,
+                               CEAA694219C35C2F00C4F7BF /* CGSRegionSPI.h in Headers */,
                                08F0BFC31255C53C00075185 /* SVGTextChunk.h in Headers */,
                                081668D4125603BF006F25DE /* SVGTextChunkBuilder.h in Headers */,
                                B2227AC80D00BF220071B782 /* SVGTextContentElement.h in Headers */,
                                B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */,
                                B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */,
                                9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */,
+                               CE650DB319BB60DD00613518 /* CGFontRenderingSPI.h in Headers */,
                                142B97CA13138943008BEF4B /* TextControlInnerElements.h in Headers */,
+                               CEAA694619C35C4F00C4F7BF /* AVPlayerControllerSPI.h in Headers */,
                                B2C3DA450D006C1D00EF6F26 /* TextDirection.h in Headers */,
                                97BC84B412371180000C6161 /* TextDocument.h in Headers */,
                                97BC84841236FD93000C6161 /* TextDocumentParser.h in Headers */,
                                8678D0BB1878E891003ABDE6 /* ViewState.h in Headers */,
                                93309E20099E64920056E581 /* VisiblePosition.h in Headers */,
                                07AB996918DA3C010018771E /* RTCConfiguration.h in Headers */,
+                               CEAA694D19C35C6500C4F7BF /* QuickLookSPI.h in Headers */,
                                A883DF280F3D045D00F19BF6 /* VisibleSelection.h in Headers */,
                                93309E1E099E64920056E581 /* VisibleUnits.h in Headers */,
                                419BC2DF1685329900D64D6D /* VisitedLinkState.h in Headers */,
                                C5B4C24D1509236C00A6EF37 /* WebCoreNSURLExtras.h in Headers */,
                                DD05FE0D0B8BA3C6009ACDFE /* WebCoreObjCExtras.h in Headers */,
                                EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */,
+                               CEAA693E19C35C2200C4F7BF /* CGFontGlyphSupportSPI.h in Headers */,
                                E180810F16FCECDF00B80D07 /* WebCoreResourceHandleAsDelegate.h in Headers */,
                                E152551516FD2350003D7ADB /* WebCoreResourceHandleAsOperationQueueDelegate.h in Headers */,
                                93EB169709F880C00091F8FF /* WebCoreSystemInterface.h in Headers */,
                                2EA768040FE7126400AB9C8A /* WorkerScriptLoaderClient.h in Headers */,
                                2E4346550F546A8200B0F1BA /* WorkerThread.h in Headers */,
                                0B9056F90F2685F30095FF6A /* WorkerThreadableLoader.h in Headers */,
+                               CEAA694419C35C3B00C4F7BF /* IOPMLibSPI.h in Headers */,
                                97AABD2D14FA09D5007457AE /* WorkerThreadableWebSocketChannel.h in Headers */,
                                0FE5806419327A6200DE32EB /* ScrollingTreeMac.h in Headers */,
                                93309E24099E64920056E581 /* WrapContentsInDummySpanCommand.h in Headers */,
index 5e77361..2ea0474 100644 (file)
@@ -36,6 +36,8 @@
 
 #if PLATFORM(IOS)
 #define NEEDS_WRAPPER_CACHE_LOCK 1
+
+#import "NSPointerFunctionsSPI.h"
 #endif
 
 //------------------------------------------------------------------------------------------
index 015a6fb..77bbe5f 100644 (file)
 #import "config.h"
 #import "objc_instance.h"
 
-#import "runtime_method.h"
-#import <runtime/ObjectPrototype.h>
 #import "JSDOMBinding.h"
+#import "NSPointerFunctionsSPI.h"
 #import "ObjCRuntimeObject.h"
 #import "WebScriptObject.h"
+#import "runtime_method.h"
 #import <objc/objc-auto.h>
 #import <runtime/Error.h>
+#import <runtime/FunctionPrototype.h>
 #import <runtime/JSLock.h>
-#import "runtime/FunctionPrototype.h"
+#import <runtime/ObjectPrototype.h>
 #import <wtf/Assertions.h>
 
 #if PLATFORM(IOS)
 #import <Foundation/NSMapTable.h>
-#endif // PLATFORM(IOS)
+#endif
 
 #ifdef NDEBUG
 #define OBJC_LOG(formatAndArgs...) ((void)0)
index dfa2b66..99ede0c 100644 (file)
 #if PLATFORM(IOS)
 
 #import "Logging.h"
+#import "MPAVRoutingControllerSPI.h"
 #import "MediaPlayer.h"
 #import "MediaSession.h"
 #import "SoftLinking.h"
 #import "WebCoreSystemInterface.h"
 #import "WebCoreThreadRun.h"
 #import <AVFoundation/AVAudioSession.h>
-#import <MediaPlayer/MPAVRoutingController.h>
 #import <MediaPlayer/MPMediaItem.h>
 #import <MediaPlayer/MPNowPlayingInfoCenter.h>
 #import <MediaPlayer/MPVolumeView.h>
index 7ee2e08..ab9e231 100644 (file)
@@ -28,7 +28,7 @@
 
 #if PLATFORM(COCOA)
 
-#include <IOKit/pwr_mgt/IOPMLib.h>
+#include "IOPMLibSPI.h"
 #include <wtf/RetainPtr.h>
 
 namespace WebCore {
index 804250a..3441aba 100644 (file)
@@ -26,6 +26,7 @@
 #import "config.h"
 #import "MemoryPressureHandler.h"
 
+#import "DispatchSPI.h"
 #import "IOSurfacePool.h"
 #import "GCController.h"
 #import "JSDOMWindowBase.h"
@@ -41,7 +42,6 @@
 #if PLATFORM(IOS)
 #import "SystemMemory.h"
 #import "WebCoreThread.h"
-#import <dispatch/private.h>
 #endif
 
 namespace WebCore {
index d302722..c7bbb0c 100644 (file)
 #endif
 
 #if USE(CG)
-#if defined(__has_include) && __has_include(<CoreGraphics/CGFontRendering.h>)
-#include <CoreGraphics/CGFontRendering.h>
-#else
-enum {
-    kCGFontRenderingStyleAntialiasing = (1 << 0),
-    kCGFontRenderingStyleSmoothing = (1 << 1),
-    kCGFontRenderingStyleSubpixelPositioning = (1 << 2),
-    kCGFontRenderingStyleSubpixelQuantization = (1 << 3),
-    kCGFontRenderingStylePlatformNative = (1 << 9),
-    kCGFontRenderingStyleMask = 0x20F
-};
-#endif
-typedef uint32_t CGFontRenderingStyle;
+#include <WebCore/CGFontRenderingSPI.h>
 #endif
 
 namespace WebCore {
index 73e4adb..07c22c4 100644 (file)
@@ -44,6 +44,7 @@
 #import "InbandMetadataTextTrackPrivateAVF.h"
 #import "InbandTextTrackPrivateAVFObjC.h"
 #import "InbandTextTrackPrivateLegacyAVFObjC.h"
+#import "NSGeometrySPI.h"
 #import "OutOfBandTextTrackPrivateAVF.h"
 #import "URL.h"
 #import "Logging.h"
@@ -75,7 +76,6 @@
 #include "TextTrack.h"
 #endif
 
-#import <Foundation/NSGeometry.h>
 #import <AVFoundation/AVFoundation.h>
 #if PLATFORM(IOS)
 #import <CoreImage/CoreImage.h>
index aadc611..d93c1f8 100644 (file)
@@ -29,6 +29,8 @@
 
 #import "AnimationUtilities.h"
 #import "BlockExceptions.h"
+#import "CALayerSPI.h"
+#import "CATiledLayerSPI.h"
 #import "GraphicsContext.h"
 #import "GraphicsLayerCA.h"
 #import "LengthFunctions.h"
 #import <wtf/RetainPtr.h>
 
 #if PLATFORM(IOS)
+#import "NSGeometrySPI.h"
 #import "WAKWindow.h"
 #import "WKGraphics.h"
 #import "WebCoreThread.h"
 #import "WebTiledLayer.h"
-#import <Foundation/NSGeometry.h>
-#import <QuartzCore/CATiledLayerPrivate.h>
 #else
 #import "ThemeMac.h"
 #endif
@@ -170,18 +171,6 @@ static double mediaTimeToCurrentTime(CFTimeInterval t)
 
 @end
 
-@interface CATiledLayer(GraphicsLayerCAPrivate)
-- (void)displayInRect:(CGRect)r levelOfDetail:(int)lod options:(NSDictionary *)dict;
-- (BOOL)canDrawConcurrently;
-- (void)setCanDrawConcurrently:(BOOL)flag;
-@end
-
-@interface CALayer(Private)
-- (void)setContentsChanged;
-- (void)setAcceleratesDrawing:(BOOL)flag;
-- (BOOL)acceleratesDrawing;
-@end
-
 void PlatformCALayerMac::setOwner(PlatformCALayerClient* owner)
 {
     PlatformCALayer::setOwner(owner);
index 8a4a13e..d2519c8 100644 (file)
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
-#if PLATFORM(IOS)
-#include <CoreGraphics/CGContextPrivate.h>
-#endif
-
 #if PLATFORM(COCOA)
 #include "WebCoreSystemInterface.h"
 #endif
index 0756691..55d4b3b 100644 (file)
@@ -34,8 +34,7 @@
 #if !PLATFORM(IOS)
 #include <ApplicationServices/ApplicationServices.h>
 #else
-#include <CoreGraphics/CGColorTransform.h>
-#include <CoreGraphics/CoreGraphics.h>
+#include "CGColorTransformSPI.h"
 #include <wtf/StdLibExtras.h>
 #endif // !PLATFORM(IOS)
 
index 1e3aa75..3c10be6 100644 (file)
 #include "GraphicsContextCG.h"
 
 #include "AffineTransform.h"
+#include "CGContextSPI.h"
 #include "FloatConversion.h"
 #include "GraphicsContextPlatformPrivateCG.h"
 #include "ImageBuffer.h"
 #include "ImageOrientation.h"
-#include "URL.h"
 #include "Path.h"
 #include "Pattern.h"
 #include "ShadowBlur.h"
 #include "SubimageCacheWithTimer.h"
 #include "Timer.h"
+#include "URL.h"
 #include <CoreGraphics/CoreGraphics.h>
 #include <wtf/MathExtras.h>
 #include <wtf/RetainPtr.h>
 #endif
 
 #if PLATFORM(IOS)
-#include <CoreGraphics/CGContextGState.h>
 #include <wtf/HashMap.h>
 #endif
 
-#if !PLATFORM(IOS)
-extern "C" {
-    CG_EXTERN void CGContextSetCTM(CGContextRef, CGAffineTransform);
-    CG_EXTERN CGAffineTransform CGContextGetBaseCTM(CGContextRef);
-};
-#endif // !PLATFORM(IOS)
-
 // FIXME: The following using declaration should be in <wtf/HashFunctions.h>.
 using WTF::pairIntHash;
 
index d06f383..c039ea7 100644 (file)
@@ -37,7 +37,7 @@
 #if !PLATFORM(IOS)
 #include <ApplicationServices/ApplicationServices.h>
 #else
-#include <CoreGraphics/CGImagePrivate.h>
+#include "CGImageSPI.h"
 #include <ImageIO/ImageIO.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/RetainPtr.h>
index 1cbcf53..8a09ef1 100644 (file)
@@ -30,8 +30,6 @@
 #if USE(CG)
 
 #if PLATFORM(IOS)
-#import <CoreGraphics/CGContextPrivate.h>
-#import <CoreGraphics/CGContextGState.h>
 #import <CoreGraphics/CoreGraphics.h>
 #import <ImageIO/ImageIO.h>
 #endif
index 3ff1823..811f57e 100644 (file)
@@ -28,8 +28,8 @@
 #if !PLATFORM(IOS)
 #import <AppKit/NSFont.h>
 #else
+#import "CGFontInfoSPI.h"
 #import <CoreText/CoreText.h>
-#import <CoreGraphics/CGFontInfo.h>
 #endif
 
 #import <wtf/text/WTFString.h>
index 4fb845b..3c87881 100644 (file)
 #import "config.h"
 #import "FontCache.h"
 
+#import "CGFontUnicodeSupportSPI.h"
+#import "CTFontDescriptorSPI.h"
+#import "CTFontSPI.h"
 #import "Font.h"
 #import "RenderThemeIOS.h"
-#import <CoreGraphics/CGFontUnicodeSupport.h>
-#import <CoreText/CTFontDescriptorPriv.h>
-#import <CoreText/CTFontPriv.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/text/CString.h>
index c062dc8..ebb6ba6 100644 (file)
 #import "config.h"
 #import "FontServicesIOS.h"
 
+#import "CGFontInfoSPI.h"
 #import "FontMetrics.h"
-#import <CoreGraphics/CoreGraphics.h>
-#import <CoreGraphics/CoreGraphicsPrivate.h>
-#import <mach-o/dyld_priv.h>
+#import "dyldSPI.h"
 #import <wtf/RetainPtr.h>
 
 namespace WebCore {
index 4af8a23..7a7a224 100644 (file)
 #import "SimpleFontData.h"
 
 #import "BlockExceptions.h"
+#import "CGFontInfoSPI.h"
+#import "CGFontRenderingSPI.h"
 #import "Font.h"
 #import "FontCache.h"
 #import "FontDescription.h"
 #import "FontServicesIOS.h"
-#import <CoreGraphics/CGFontInfo.h>
 #import <CoreText/CoreText.h>
 #import <float.h>
 #import <unicode/uchar.h>
index f843a12..c84df86 100644 (file)
@@ -23,6 +23,7 @@
 #import "config.h"
 #import "Font.h"
 
+#import "CTFontDescriptorSPI.h"
 #import "DashArray.h"
 #import "GlyphBuffer.h"
 #import "GraphicsContext.h"
 #endif
 #import <wtf/MathExtras.h>
 
-#if __has_include(<CoreText/CTFontDescriptorPriv.h>)
-#import <CoreText/CTFontDescriptorPriv.h>
-#endif
-extern "C" bool CTFontDescriptorIsSystemUIFont(CTFontDescriptorRef);
-
 #if ENABLE(LETTERPRESS)
+#import "CGContextSPI.h"
+#import "CUICatalogSPI.h"
+#import "CUIStyleEffectConfigurationSPI.h"
 #import "SoftLinking.h"
-#if __has_include(<CoreGraphics/CoreGraphicsPrivate.h>)
-#import <CoreGraphics/CoreGraphicsPrivate.h>
-#else
-extern CGColorRef CGContextGetFillColorAsColor(CGContextRef);
-#endif
-#import <CoreUI/CUICatalog.h>
-#import <CoreUI/CUIStyleEffectConfiguration.h>
 
 SOFT_LINK_PRIVATE_FRAMEWORK(CoreUI)
 SOFT_LINK_CLASS(CoreUI, CUICatalog)
@@ -55,7 +47,7 @@ SOFT_LINK_CLASS(CoreUI, CUIStyleEffectConfiguration)
 
 SOFT_LINK_FRAMEWORK(UIKit)
 SOFT_LINK(UIKit, _UIKitGetTextEffectsCatalog, CUICatalog *, (void), ())
-#endif
+#endif // ENABLE(LETTERPRESS)
 
 #define SYNTHETIC_OBLIQUE_ANGLE 14
 
index 1745cf6..ba495e8 100644 (file)
@@ -35,8 +35,7 @@
 #if !PLATFORM(IOS)
 #include <ApplicationServices/ApplicationServices.h>
 #else
-#include <CoreGraphics/CGFontUnicodeSupport.h>
-#include <CoreText/CTFontPriv.h>
+#include "CGFontUnicodeSupportSPI.h"
 #include <CoreText/CoreText.h>
 #endif
 
index e93be24..a8e991b 100644 (file)
@@ -28,7 +28,7 @@
 
 #if TARGET_OS_IPHONE
 #if defined(__OBJC__)
-#import <Foundation/NSGeometry.h>
+#import <WebCore/NSGeometrySPI.h>
 #endif
 
 // Needed since this is a WebKit private header on iOS.
index fbdc744..6e74eba 100644 (file)
@@ -28,6 +28,8 @@
 #import "SimpleFontData.h"
 
 #import "BlockExceptions.h"
+#import "CGFontGlyphSupportSPI.h"
+#import "CTFontDescriptorSPI.h"
 #import "Color.h"
 #import "FloatRect.h"
 #import "Font.h"
 #import <float.h>
 #import <unicode/uchar.h>
 #import <wtf/Assertions.h>
-#import <wtf/StdLibExtras.h>
 #import <wtf/RetainPtr.h>
-
-#if defined(__has_include) && __has_include(<CoreText/CTFontDescriptorPriv.h>)
-#import <CoreText/CTFontDescriptorPriv.h>
-#endif
-extern "C" bool CTFontDescriptorIsSystemUIFont(CTFontDescriptorRef);
-
-#if defined(__has_include) && __has_include(<CoreGraphics/CGFontGlyphSupport.h>)
-#import <CoreGraphics/CGFontGlyphSupport.h>
-#endif
-extern "C" bool CGFontGetGlyphAdvancesForStyle(CGFontRef font,
-    const CGAffineTransform *t, CGFontRenderingStyle style,
-    const CGGlyph glyphs[], size_t count, CGSize advances[]);
+#import <wtf/StdLibExtras.h>
 
 #if !PLATFORM(IOS)
 @interface NSFont (WebAppKitSecretAPI)
index 6c00142..a0e2b90 100644 (file)
@@ -28,6 +28,8 @@
 
 #if PLATFORM(IOS)
 
+#include "CALayerSPI.h"
+#include "CGSRegionSPI.h"
 #include "LegacyTileGrid.h"
 #include "LegacyTileGridTile.h"
 #include "LegacyTileLayer.h"
@@ -40,7 +42,6 @@
 #include "WebCoreSystemInterface.h"
 #include "WebCoreThreadRun.h"
 #include <QuartzCore/QuartzCore.h>
-#include <QuartzCore/QuartzCorePrivate.h>
 #include <wtf/CurrentTime.h>
 
 @interface WAKView (WebViewExtras)
index a92df13..5ce37b4 100644 (file)
 
 #if PLATFORM(IOS)
 
+#include "CALayerSPI.h"
+#include "CGFloatSPI.h"
 #include "MemoryPressureHandler.h"
 #include "SystemMemory.h"
 #include "LegacyTileGridTile.h"
 #include "LegacyTileLayer.h"
 #include "LegacyTileLayerPool.h"
 #include "WAKWindow.h"
-#include <CoreGraphics/CoreGraphicsPrivate.h>
+#include <CoreGraphics/CoreGraphics.h>
 #include <QuartzCore/QuartzCore.h>
-#include <QuartzCore/QuartzCorePrivate.h>
 #include <algorithm>
 #include <functional>
 
index ccf4eb8..40f2b96 100644 (file)
@@ -28,6 +28,7 @@
 
 #if PLATFORM(IOS)
 
+#include "CALayerSPI.h"
 #include "Color.h"
 #include "LegacyTileCache.h"
 #include "LegacyTileGrid.h"
@@ -35,7 +36,6 @@
 #include "LegacyTileLayerPool.h"
 #include "WAKWindow.h"
 #include <QuartzCore/QuartzCore.h>
-#include <QuartzCore/QuartzCorePrivate.h>
 #include <algorithm>
 #include <functional>
 
index 465315b..0e08cf2 100644 (file)
 #import "config.h"
 #import "PlatformEventFactoryIOS.h"
 
-#import <Foundation/NSGeometry.h>
+#import "NSGeometrySPI.h"
 #import <IntPoint.h>
 #import <KeyEventCocoa.h>
 #import <Logging.h>
 #import <WebEvent.h>
+#import <wtf/CurrentTime.h>
 
 namespace WebCore {
 
index ef25f24..5dc5b7d 100644 (file)
 #import "FrameView.h"
 #import "HostWindow.h"
 #import "IntRect.h"
+#import "MobileGestaltSPI.h"
 #import "WAKWindow.h"
 #import "WebCoreSystemInterface.h"
 #import "Widget.h"
-#import <MobileGestalt.h>
 
 namespace WebCore {
 
index b7de96c..a5886f6 100644 (file)
@@ -29,7 +29,7 @@
 #import "WebEvent.h"
 
 #import "KeyEventCocoa.h"
-#import <Foundation/NSGeometry.h>
+#import "NSGeometrySPI.h"
 #import <wtf/Assertions.h>
 
 using namespace WebCore;
index debbc9c..fe37565 100644 (file)
 
 #import "WebVideoFullscreenInterfaceAVKit.h"
 
+#import "AVPlayerControllerSPI.h"
+#import "AVPlayerViewControllerSPI.h"
+#import "AVValueTimingSPI.h"
+#import "AVVideoLayerSPI.h"
 #import "Logging.h"
 #import "GeometryUtilities.h"
 #import "WebVideoFullscreenModel.h"
 #import <AVFoundation/AVTime.h>
 #import <AVKit/AVKit.h>
-#import <AVKit/AVPlayerController.h>
-#import <AVKit/AVPlayerViewController_Private.h>
-#import <AVKit/AVPlayerViewController_WebKitOnly.h>
-#import <AVKit/AVValueTiming.h>
-#import <AVKit/AVVideoLayer.h>
 #import <CoreMedia/CMTime.h>
 #import <UIKit/UIKit.h>
 #import <WebCore/RuntimeApplicationChecksIOS.h>
index 7385ec0..6992033 100644 (file)
@@ -32,8 +32,9 @@
 
 #import <CoreGraphics/CoreGraphics.h>
 #import <Foundation/Foundation.h>
+
 // FIXME: <rdar://problem/6669434> Switch from using NSGeometry methods to CGGeometry methods
-#import <Foundation/NSGeometry.h>
+#import <WebCore/NSGeometrySPI.h>
 
 #ifndef NSClipView
 #define NSClipView WAKClipView
index 9998f70..39ce104 100644 (file)
 
 #if TARGET_OS_IPHONE
 
-#import "WAKResponder.h"
-#import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>
-
-#ifndef NSRect
-#define NSRect CGRect
-#endif
-#define NSPoint CGPoint
-#define NSSize CGSize
+#import <Foundation/Foundation.h>
+#import <WebCore/NSGeometrySPI.h>
+#import <WebCore/WAKResponder.h>
 
 extern NSString *WAKViewFrameSizeDidChangeNotification;
 extern NSString *WAKViewDidScrollNotification;
index bf38596..ede08d6 100644 (file)
@@ -28,8 +28,8 @@
 
 #if TARGET_OS_IPHONE
 
-#import <CoreGraphics/CoreGraphics.h>
-#import <CoreGraphics/CoreGraphicsPrivate.h>
+#import <WebCore/CGContextSPI.h>
+#import <WebCore/CGFontRenderingSPI.h>
 
 #ifdef __cplusplus
 extern "C" {
index 31c6ec0..b1886a8 100644 (file)
@@ -28,8 +28,9 @@
 
 #if PLATFORM(IOS)
 
-#import "WebCoreSystemInterface.h"
+#import "CGContextSPI.h"
 #import "Font.h"
+#import "WebCoreSystemInterface.h"
 #import "WebCoreThread.h"
 #import <ImageIO/ImageIO.h>
 #import <wtf/StdLibExtras.h>
index 5c01c66..4b09d1f 100644 (file)
@@ -45,7 +45,6 @@
 #import <wtf/Threading.h>
 #import <wtf/text/AtomicString.h>
 
-#import <CoreFoundation/CFPriv.h>
 #import <Foundation/NSInvocation.h>
 #import <libkern/OSAtomic.h>
 #import <objc/runtime.h>
index 8f849e3..11510a8 100644 (file)
@@ -31,6 +31,9 @@
 #import "DocumentLoader.h"
 #import "FileSystemIOS.h"
 #import "Logging.h"
+#import "NSFileManagerSPI.h"
+#import "QLPreviewConverterSPI.h"
+#import "QuickLookSPI.h"
 #import "ResourceError.h"
 #import "ResourceHandle.h"
 #import "ResourceLoader.h"
@@ -39,9 +42,6 @@
 #import "SynchronousResourceHandleCFURLConnectionDelegate.h"
 #import "WebCoreURLResponseIOS.h"
 #import <Foundation/Foundation.h>
-#import <Foundation/NSFileManager_NSURLExtras.h>
-#import <QuickLook/QLPreviewConverter.h>
-#import <QuickLook/QuickLookPrivate.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/StdLibExtras.h>
 #import <wtf/Threading.h>
diff --git a/Source/WebCore/platform/spi/ca/CALayerSPI.h b/Source/WebCore/platform/spi/ca/CALayerSPI.h
new file mode 100644 (file)
index 0000000..bd67a4e
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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. 
+ */
+
+#import <QuartzCore/CALayer.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <QuartzCore/CALayerPrivate.h>
+#else
+@class CAContext;
+
+@interface CALayer (Details)
+- (CAContext *)context;
+- (CGSize)size;
+- (void *)regionBeingDrawn;
+- (void)setContentsChanged;
+@property BOOL acceleratesDrawing;
+@property BOOL allowsGroupBlending;
+@property BOOL canDrawConcurrently;
+@property BOOL contentsOpaque;
+@property BOOL needsLayoutOnGeometryChange;
+@end
+#endif
diff --git a/Source/WebCore/platform/spi/ca/CATiledLayerSPI.h b/Source/WebCore/platform/spi/ca/CATiledLayerSPI.h
new file mode 100644 (file)
index 0000000..d237093
--- /dev/null
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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. 
+ */
+
+#import <QuartzCore/CATiledLayer.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <QuartzCore/CATiledLayerPrivate.h>
+#else
+@interface CATiledLayer (Details)
+- (void)displayInRect:(CGRect)rect levelOfDetail:(int)levelOfDetail options:(NSDictionary *)dictionary;
+- (void)setNeedsDisplayInRect:(CGRect)rect levelOfDetail:(int)levelOfDetail options:(NSDictionary *)dictionary;
+@end
+#endif
+
+extern NSString * const kCATiledLayerRemoveImmediately;
index 3d1a185..08d7c79 100644 (file)
 #import <CoreFoundation/CFPriv.h>
 #endif
 
-extern "C" {
 // FIXME: <rdar://problem/18128192> Make CFLocaleGetLanguageRegionEncodingForLocaleIdentifier public API
 // FIXME: <rdar://problem/18083880> Replace use of Script Manager to canonicalize locales with a custom Web-specific table
-Boolean CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(CFStringRef locale, LangCode*, RegionCode*, ScriptCode*, CFStringEncoding*);
-}
+EXTERN_C Boolean CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(CFStringRef locale, LangCode*, RegionCode*, ScriptCode*, CFStringEncoding*);
 
 #endif
index ce29135..a8f3947 100644 (file)
@@ -34,6 +34,6 @@ enum HTTPConnectionCacheLimitKeys {
 };
 #endif
 
-extern "C" void _CFNetworkHTTPConnectionCacheSetLimit(HTTPConnectionCacheLimitKeys, int);
+EXTERN_C void _CFNetworkHTTPConnectionCacheSetLimit(HTTPConnectionCacheLimitKeys, int);
 
 #endif
index 027ee6a..9fa41ae 100644 (file)
 #ifndef CFURLRequestSPI_h
 #define CFURLRequestSPI_h
 
+#include <CoreFoundation/CFBase.h>
+
 #if USE(APPLE_INTERNAL_SDK)
 #include <CFNetwork/CFURLRequest.h>
 #else
-#include <CoreFoundation/CFBase.h>
 typedef const struct _CFURLRequest *CFURLRequestRef;
 #endif
 
-extern "C" void CFURLRequestSetShouldStartSynchronously(CFURLRequestRef, Boolean);
+EXTERN_C void CFURLRequestSetShouldStartSynchronously(CFURLRequestRef, Boolean);
 
 #endif
diff --git a/Source/WebCore/platform/spi/cg/CGColorTransformSPI.h b/Source/WebCore/platform/spi/cg/CGColorTransformSPI.h
new file mode 100644 (file)
index 0000000..3d10210
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 CGColorTransformSPI_h
+#define CGColorTransformSPI_h
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreGraphics/CoreGraphics.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <CoreGraphics/CGColorTransform.h>
+#else
+typedef const struct CGColorTransform* CGColorTransformRef;
+#endif
+
+EXTERN_C CGColorRef CGColorTransformConvertColor(CGColorTransformRef, CGColorRef, CGColorRenderingIntent);
+EXTERN_C CGColorTransformRef CGColorTransformCreate(CGColorSpaceRef, CFDictionaryRef attributes);
+
+#endif // CGColorTransformSPI_h
diff --git a/Source/WebCore/platform/spi/cg/CGContextSPI.h b/Source/WebCore/platform/spi/cg/CGContextSPI.h
new file mode 100644 (file)
index 0000000..51243f5
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 CGContextSPI_h
+#define CGContextSPI_h
+
+#include <CoreGraphics/CGContext.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <CoreGraphics/CGContextGState.h>
+#include <CoreGraphics/CGContextPrivate.h>
+#else
+typedef enum {
+    kCGCompositeCopy = 1,
+    kCGCompositeSover = 2,
+} CGCompositeOperation;
+#endif
+
+EXTERN_C CGAffineTransform CGContextGetBaseCTM(CGContextRef);
+EXTERN_C CGColorRef CGContextGetFillColorAsColor(CGContextRef);
+EXTERN_C CGCompositeOperation CGContextGetCompositeOperation(CGContextRef);
+EXTERN_C CGFloat CGContextGetLineWidth(CGContextRef);
+EXTERN_C void CGContextSetBaseCTM(CGContextRef, CGAffineTransform);
+EXTERN_C void CGContextSetCTM(CGContextRef, CGAffineTransform);
+EXTERN_C void CGContextSetCompositeOperation(CGContextRef, CGCompositeOperation);
+
+#endif // CGContextSPI_h
diff --git a/Source/WebCore/platform/spi/cg/CGFloatSPI.h b/Source/WebCore/platform/spi/cg/CGFloatSPI.h
new file mode 100644 (file)
index 0000000..cea3037
--- /dev/null
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 CGFloatSPI_h
+#define CGFloatSPI_h
+
+#include <CoreGraphics/CGBase.h>
+#include <math.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <CoreGraphics/CGFloat.h>
+#else
+static inline CGFloat CGRound(CGFloat value)
+{
+#if CGFLOAT_IS_DOUBLE
+    return round(value);
+#else
+    return roundf(value);
+#endif
+}
+
+static inline CGFloat CGFloor(CGFloat value)
+{
+#if CGFLOAT_IS_DOUBLE
+    return floor(value);
+#else
+    return floorf(value);
+#endif
+}
+
+static inline CGFloat CGFAbs(CGFloat value)
+{
+#if CGFLOAT_IS_DOUBLE
+    return fabs(value);
+#else
+    return fabsf(value);
+#endif
+}
+
+static inline CGFloat CGFloatMin(CGFloat a, CGFloat b)
+{
+    return isnan(a) ? b : ((isnan(b) || a < b) ? a : b);
+}
+#endif
+
+#endif // CGFloatSPI_h
diff --git a/Source/WebCore/platform/spi/cg/CGFontGlyphSupportSPI.h b/Source/WebCore/platform/spi/cg/CGFontGlyphSupportSPI.h
new file mode 100644 (file)
index 0000000..453be77
--- /dev/null
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 CGFontGlyphSupportSPI_h
+#define CGFontGlyphSupportSPI_h
+
+#include <CoreGraphics/CoreGraphics.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <CoreGraphics/CGFontGlyphSupport.h>
+#else
+typedef uint32_t CGFontRenderingStyle;
+#endif
+
+EXTERN_C bool CGFontGetGlyphAdvancesForStyle(CGFontRef, const CGAffineTransform* , CGFontRenderingStyle, const CGGlyph glyphs[], size_t count, CGSize advances[]);
+
+#endif // CGFontGlyphSupportSPI_h
diff --git a/Source/WebCore/platform/spi/cg/CGFontInfoSPI.h b/Source/WebCore/platform/spi/cg/CGFontInfoSPI.h
new file mode 100644 (file)
index 0000000..bbf2ff9
--- /dev/null
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 CGFontInfoSPI_h
+#define CGFontInfoSPI_h
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreGraphics/CGFont.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <CoreGraphics/CGFontInfo.h>
+#else
+struct CGFontHMetrics {
+    int ascent;
+    int descent;
+    int lineGap;
+    int maxAdvanceWidth;
+    int minLeftSideBearing;
+    int minRightSideBearing;
+};
+
+struct CGFontDescriptor {
+    CGRect bbox;
+    CGFloat ascent;
+    CGFloat descent;
+    CGFloat capHeight;
+    CGFloat italicAngle;
+    CGFloat stemV;
+    CGFloat stemH;
+    CGFloat avgWidth;
+    CGFloat maxWidth;
+    CGFloat missingWidth;
+    CGFloat leading;
+    CGFloat xHeight;
+};
+#endif
+
+EXTERN_C CFStringRef CGFontCopyFamilyName(CGFontRef);
+EXTERN_C bool CGFontGetDescriptor(CGFontRef, CGFontDescriptor*);
+EXTERN_C bool CGFontIsFixedPitch(CGFontRef);
+EXTERN_C const CGFontHMetrics* CGFontGetHMetrics(CGFontRef);
+EXTERN_C const char* CGFontGetPostScriptName(CGFontRef);
+
+#endif // CGFontInfoSPI_h
diff --git a/Source/WebCore/platform/spi/cg/CGFontRenderingSPI.h b/Source/WebCore/platform/spi/cg/CGFontRenderingSPI.h
new file mode 100644 (file)
index 0000000..1d0bb1a
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 CGFontRenderingSPI_h
+#define CGFontRenderingSPI_h
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <CoreGraphics/CGFontRendering.h>
+#else
+enum {
+    kCGFontRenderingStyleAntialiasing = 1 << 0,
+    kCGFontRenderingStyleSmoothing = 1 << 1,
+    kCGFontRenderingStyleSubpixelPositioning = 1 << 2,
+    kCGFontRenderingStyleSubpixelQuantization = 1 << 3,
+    kCGFontRenderingStylePlatformNative = 1 << 9,
+    kCGFontRenderingStyleMask = 0x20F,
+};
+typedef uint32_t CGFontRenderingStyle;
+
+enum {
+    kCGFontAntialiasingStyleUnfiltered = 0 << 7,
+    kCGFontAntialiasingStyleFilterLight = 1 << 7,
+};
+typedef uint32_t CGFontAntialiasingStyle;
+#endif
+
+#endif // CGFontRenderingSPI_h
diff --git a/Source/WebCore/platform/spi/cg/CGFontUnicodeSupportSPI.h b/Source/WebCore/platform/spi/cg/CGFontUnicodeSupportSPI.h
new file mode 100644 (file)
index 0000000..6d73071
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 CGFontUnicodeSupportSPI_h
+#define CGFontUnicodeSupportSPI_h
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreGraphics/CGFont.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <CoreGraphics/CGFontUnicodeSupport.h>
+#endif
+
+EXTERN_C void CGFontGetGlyphsForUnichars(CGFontRef, const UniChar[], CGGlyph[], size_t count);
+
+#endif // CGFontUnicodeSupportSPI_h
diff --git a/Source/WebCore/platform/spi/cg/CGImageSPI.h b/Source/WebCore/platform/spi/cg/CGImageSPI.h
new file mode 100644 (file)
index 0000000..33497c1
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 CGImageSPI_h
+#define CGImageSPI_h
+
+#include <CoreGraphics/CGImage.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <CoreGraphics/CGImagePrivate.h>
+#else
+enum {
+    kCGImageCachingTemporary = 3,
+};
+typedef uint32_t CGImageCachingFlags;
+#endif
+
+EXTERN_C void CGImageSetCachingFlags(CGImageRef, CGImageCachingFlags);
+
+#endif // CGImageSPI_h
diff --git a/Source/WebCore/platform/spi/cg/CGSRegionSPI.h b/Source/WebCore/platform/spi/cg/CGSRegionSPI.h
new file mode 100644 (file)
index 0000000..371a2d0
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 CGSRegionSPI_h
+#define CGSRegionSPI_h
+
+#include <CoreGraphics/CGGeometry.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <CoreGraphics/CGSRegion.h>
+#else
+typedef struct CGSRegionEnumeratorObject* CGSRegionEnumeratorObj;
+typedef struct CGSRegionObject* CGRegionRef;
+typedef struct CGSRegionObject* CGSRegionObj;
+#endif
+
+EXTERN_C CGSRegionEnumeratorObj CGSRegionEnumerator(CGRegionRef);
+EXTERN_C CGRect* CGSNextRect(const CGSRegionEnumeratorObj);
+EXTERN_C CGError CGSReleaseRegionEnumerator(const CGSRegionEnumeratorObj);
+
+#endif // CGSRegionSPI_h
diff --git a/Source/WebCore/platform/spi/cocoa/DispatchSPI.h b/Source/WebCore/platform/spi/cocoa/DispatchSPI.h
new file mode 100644 (file)
index 0000000..7dc8570
--- /dev/null
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 DispatchSPI_h
+#define DispatchSPI_h
+
+#include <dispatch/dispatch.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+// FIXME: As a workaround for <rdar://problem/18337182>, we conditionally enclose the header
+// <dispatch/private.h> in an extern "C" linkage block to make it suitable for C++ use.
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <dispatch/private.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#else // USE(APPLE_INTERNAL_SDK)
+
+enum {
+    DISPATCH_MEMORYSTATUS_PRESSURE_NORMAL = 0x01,
+    DISPATCH_MEMORYSTATUS_PRESSURE_WARN = 0x02,
+    DISPATCH_MEMORYSTATUS_PRESSURE_CRITICAL = 0x04,
+};
+#define DISPATCH_SOURCE_TYPE_MEMORYSTATUS (&_dispatch_source_type_memorystatus)
+
+#endif
+
+EXTERN_C const struct dispatch_source_type_s _dispatch_source_type_memorystatus;
+
+#endif // DispatchSPI_h
diff --git a/Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h b/Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h
new file mode 100644 (file)
index 0000000..0526017
--- /dev/null
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 IOPMLibSPI_h
+#define IOPMLibSPI_h
+
+#include <CoreFoundation/CoreFoundation.h>
+
+#if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
+#include <IOKit/pwr_mgt/IOPMLib.h>
+#else
+#include <mach/kern_return.h>
+
+typedef kern_return_t IOReturn;
+typedef uint32_t IOPMAssertionID;
+
+static const CFStringRef kIOPMAssertionTypePreventUserIdleDisplaySleep = CFSTR("PreventUserIdleDisplaySleep");
+#endif
+
+EXTERN_C IOReturn IOPMAssertionCreateWithDescription(CFStringRef assertionType, CFStringRef name, CFStringRef details,
+    CFStringRef humanReadableReason, CFStringRef localizationBundlePath, CFTimeInterval timeout, CFStringRef timeoutAction, IOPMAssertionID *);
+EXTERN_C IOReturn IOPMAssertionRelease(IOPMAssertionID);
+
+#endif // IOPMLibSPI_h
diff --git a/Source/WebCore/platform/spi/cocoa/MachVMSPI.h b/Source/WebCore/platform/spi/cocoa/MachVMSPI.h
new file mode 100644 (file)
index 0000000..829cb31
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 MachVMSPI_h
+#define MachVMSPI_h
+
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/mach_types.h>
+
+#if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
+#include <mach/mach_vm.h>
+#endif
+
+EXTERN_C kern_return_t mach_vm_allocate(vm_map_t target, mach_vm_address_t*, mach_vm_size_t, int flags);
+EXTERN_C kern_return_t mach_vm_deallocate(vm_map_t target, mach_vm_address_t, mach_vm_size_t);
+EXTERN_C kern_return_t mach_vm_map(vm_map_t targetTask, mach_vm_address_t*, mach_vm_size_t, mach_vm_offset_t mask, int flags,
+    mem_entry_name_port_t, memory_object_offset_t, boolean_t copy, vm_prot_t currentProtection, vm_prot_t maximumProtection, vm_inherit_t);
+EXTERN_C kern_return_t mach_vm_protect(vm_map_t targetTask, mach_vm_address_t, mach_vm_size_t, boolean_t setMaximum, vm_prot_t newProtection);
+EXTERN_C kern_return_t mach_vm_region(vm_map_t targetTask, mach_vm_address_t*, mach_vm_size_t*, vm_region_flavor_t, vm_region_info_t,
+    mach_msg_type_number_t* infoCount, mach_port_t* objectName);
+
+#endif // MachVMSPI_h
diff --git a/Source/WebCore/platform/spi/cocoa/NSFileManagerSPI.h b/Source/WebCore/platform/spi/cocoa/NSFileManagerSPI.h
new file mode 100644 (file)
index 0000000..3c77b48
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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. 
+ */
+
+#import <Foundation/NSFileManager.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <Foundation/NSFileManager_NSURLExtras.h>
+#else
+#define WEB_UREAD (00400)
+#define WEB_UWRITE (00200)
+#define WEB_UEXEC (00100)
+
+@interface NSFileManager (Details)
+- (BOOL)_web_createFileAtPathWithIntermediateDirectories:(NSString *)path contents:(NSData *)contents attributes:(NSDictionary *)attributes directoryAttributes:(NSDictionary *)directoryAttributes;
+- (NSString *)_web_pathWithUniqueFilenameForPath:(NSString *)path;
+- (BOOL)_web_removeFileOnlyAtPath:(NSString *)path;
+@end
+#endif
diff --git a/Source/WebCore/platform/spi/cocoa/NSGeometrySPI.h b/Source/WebCore/platform/spi/cocoa/NSGeometrySPI.h
new file mode 100644 (file)
index 0000000..17a0dcf
--- /dev/null
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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. 
+ */
+
+#import <CoreGraphics/CGBase.h>
+#import <CoreGraphics/CGGeometry.h>
+#import <Foundation/Foundation.h>
+
+#if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
+#import <Foundation/NSGeometry.h>
+#else
+typedef CGPoint NSPoint;
+typedef CGRect NSRect;
+typedef CGSize NSSize;
+typedef NSUInteger NSRectEdge;
+
+@interface NSValue (NSGeometryDetails)
++ (NSValue *)valueWithPoint:(NSPoint)point;
++ (NSValue *)valueWithRect:(NSRect)rect;
++ (NSValue *)valueWithSize:(NSSize)size;
+@property (readonly) NSPoint pointValue;
+@property (readonly) NSRect rectValue;
+@property (readonly) NSSize sizeValue;
+@end
+
+#define NSMinXEdge CGRectMinXEdge
+#define NSMinYEdge CGRectMinYEdge
+#define NSMaxXEdge CGRectMaxXEdge
+#define NSMaxYEdge CGRectMaxYEdge
+
+#define NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES 1
+
+ALWAYS_INLINE NSPoint NSMakePoint(CGFloat x, CGFloat y)
+{
+    NSPoint point;
+    point.x = x;
+    point.y = y;
+    return point;
+}
+
+ALWAYS_INLINE NSSize NSMakeSize(CGFloat width, CGFloat height)
+{
+    NSSize size;
+    size.width = width;
+    size.height = height;
+    return size;
+}
+
+ALWAYS_INLINE NSRect NSMakeRect(CGFloat x, CGFloat y, CGFloat width, CGFloat height)
+{
+    NSRect rect;
+    rect.origin.x = x;
+    rect.origin.y = y;
+    rect.size.width = width;
+    rect.size.height = height;
+    return rect;
+}
+
+ALWAYS_INLINE CGFloat NSMaxX(NSRect rect)
+{
+    return rect.origin.x + rect.size.width;
+}
+
+ALWAYS_INLINE CGFloat NSMaxY(NSRect rect)
+{
+    return rect.origin.y + rect.size.height;
+}
+
+ALWAYS_INLINE CGFloat NSMinX(NSRect rect)
+{
+    return rect.origin.x;
+}
+
+ALWAYS_INLINE CGFloat NSMinY(NSRect rect)
+{
+    return rect.origin.y;
+}
+#endif // PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
+
+extern const NSPoint NSZeroPoint;
+extern const NSRect NSZeroRect;
+extern const NSSize NSZeroSize;
+
+extern BOOL NSEqualPoints(NSPoint, NSPoint);
+extern BOOL NSEqualRects(NSRect, NSRect);
+extern BOOL NSEqualSizes(NSSize, NSSize);
+extern NSRect NSInsetRect(NSRect, CGFloat dX, CGFloat dY);
+extern NSRect NSIntersectionRect(NSRect, NSRect);
+extern BOOL NSIsEmptyRect(NSRect);
+extern BOOL NSPointInRect(NSPoint, NSRect);
diff --git a/Source/WebCore/platform/spi/cocoa/NSPointerFunctionsSPI.h b/Source/WebCore/platform/spi/cocoa/NSPointerFunctionsSPI.h
new file mode 100644 (file)
index 0000000..ba982c6
--- /dev/null
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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. 
+ */
+
+#if PLATFORM(MAC)
+#import <Foundation/NSPointerFunctions.h>
+#elif PLATFORM(IOS) && USE(APPLE_INTERNAL_SDK)
+#import <Foundation/NSPointerFunctionsPriv.h>
+#else
+enum {
+    NSPointerFunctionsZeroingWeakMemory = 1UL << 0,
+};
+#endif
diff --git a/Source/WebCore/platform/spi/cocoa/dyldSPI.h b/Source/WebCore/platform/spi/cocoa/dyldSPI.h
new file mode 100644 (file)
index 0000000..9e93958
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 dyldSPI_h
+#define dyldSPI_h
+
+#include <mach-o/dyld.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <mach-o/dyld_priv.h>
+#else
+#define DYLD_IOS_VERSION_3_0 0x00030000
+#define DYLD_IOS_VERSION_6_0 0x00060000;
+#define DYLD_IOS_VERSION_7_0 0x00070000;
+#endif
+
+EXTERN_C uint32_t dyld_get_program_sdk_version();
+
+#endif // dyldSPI_h
diff --git a/Source/WebCore/platform/spi/ios/AVPlayerControllerSPI.h b/Source/WebCore/platform/spi/ios/AVPlayerControllerSPI.h
new file mode 100644 (file)
index 0000000..09330f7
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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. 
+ */
+
+#import <AVKit/AVKit.h>
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <AVKit/AVPlayerController.h>
+#else
+@interface AVPlayerController : UIResponder
+@end
+
+@interface AVPlayerController (Details)
+typedef NS_ENUM(NSInteger, AVPlayerControllerStatus) {
+    AVPlayerControllerStatusReadyToPlay = 2,
+};
+
+typedef NS_ENUM(NSInteger, AVPlayerControllerExternalPlaybackType) {
+    AVPlayerControllerExternalPlaybackTypeNone = 0,
+    AVPlayerControllerExternalPlaybackTypeAirPlay = 1,
+    AVPlayerControllerExternalPlaybackTypeTVOut = 2,
+};
+
+@property (NS_NONATOMIC_IOSONLY, readonly) AVPlayerControllerStatus status;
+@end
+#endif
diff --git a/Source/WebCore/platform/spi/ios/AVPlayerViewControllerSPI.h b/Source/WebCore/platform/spi/ios/AVPlayerViewControllerSPI.h
new file mode 100644 (file)
index 0000000..e0aebae
--- /dev/null
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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. 
+ */
+
+#import <AVKit/AVPlayerViewController.h>
+#import <Foundation/Foundation.h>
+#import <QuartzCore/QuartzCore.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <AVKit/AVPlayerViewController_Private.h>
+#import <AVKit/AVPlayerViewController_WebKitOnly.h>
+#else
+@protocol AVPlayerViewControllerDelegate;
+@protocol AVVideoLayer;
+
+@interface AVPlayerViewController (Details)
+- (instancetype)initWithVideoLayer:(CALayer <AVVideoLayer> *)videoLayer;
+- (void)enterFullScreenWithCompletionHandler:(void (^)(BOOL success, NSError *))completionHandler;
+- (void)exitFullScreenAnimated:(BOOL)animated completionHandler:(void (^)(BOOL success, NSError *))completionHandler;
+- (void)exitFullScreenWithCompletionHandler:(void (^)(BOOL success, NSError *))completionHandler;
+@property (nonatomic, strong) AVPlayerController *playerController;
+@property (nonatomic, weak) id <AVPlayerViewControllerDelegate> delegate;
+@end
+
+@protocol AVPlayerViewControllerDelegate <NSObject>
+@optional
+typedef NS_ENUM(NSInteger, AVPlayerViewControllerExitFullScreenReason) {
+    AVPlayerViewControllerExitFullScreenReasonDoneButtonTapped = 0,
+    AVPlayerViewControllerExitFullScreenReasonRemoteControlStopEventReceived = 3,
+};
+- (BOOL)playerViewController:(AVPlayerViewController *)playerViewController shouldExitFullScreenWithReason:(AVPlayerViewControllerExitFullScreenReason)reason;
+@end
+#endif
diff --git a/Source/WebCore/platform/spi/ios/AVValueTimingSPI.h b/Source/WebCore/platform/spi/ios/AVValueTimingSPI.h
new file mode 100644 (file)
index 0000000..9996483
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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. 
+ */
+
+#import <Foundation/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <AVKit/AVValueTiming.h>
+#else
+@interface AVValueTiming : NSObject <NSCoding, NSCopying, NSMutableCopying>
+@end
+
+@interface AVValueTiming (Details)
++ (AVValueTiming *)valueTimingWithAnchorValue:(double)anchorValue anchorTimeStamp:(NSTimeInterval)timeStamp rate:(double)rate;
+@property (NS_NONATOMIC_IOSONLY, readonly) double currentValue;
+@end
+#endif
diff --git a/Source/WebCore/platform/spi/ios/AVVideoLayerSPI.h b/Source/WebCore/platform/spi/ios/AVVideoLayerSPI.h
new file mode 100644 (file)
index 0000000..f963852
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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. 
+ */
+
+#import <AVKit/AVKit.h>
+#import <CoreGraphics/CGGeometry.h>
+#import <Foundation/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <AVKit/AVVideoLayer.h>
+#else
+@protocol AVVideoLayer
+typedef NS_ENUM(NSInteger, AVVideoLayerGravity) {
+    AVVideoLayerGravityInvalid = 0,
+    AVVideoLayerGravityResizeAspect = 1,
+    AVVideoLayerGravityResizeAspectFill = 2,
+    AVVideoLayerGravityResize = 3,
+};
+- (void)setPlayerController:(AVPlayerController *)playerController;
+@property (nonatomic) AVVideoLayerGravity videoLayerGravity;
+@property (nonatomic) CGRect videoRect;
+@property (nonatomic, readonly, getter=isReadyForDisplay) BOOL readyForDisplay;
+@end
+#endif
diff --git a/Source/WebCore/platform/spi/ios/CTFontDescriptorSPI.h b/Source/WebCore/platform/spi/ios/CTFontDescriptorSPI.h
new file mode 100644 (file)
index 0000000..0bc818f
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 CTFontDescriptorSPI_h
+#define CTFontDescriptorSPI_h
+
+#include <CoreText/CoreText.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <CoreText/CTFontDescriptorPriv.h>
+#endif
+
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
+EXTERN_C const CFStringRef kCTUIFontTextStyleShortHeadline;
+EXTERN_C const CFStringRef kCTUIFontTextStyleShortBody;
+EXTERN_C const CFStringRef kCTUIFontTextStyleShortSubhead;
+EXTERN_C const CFStringRef kCTUIFontTextStyleShortFootnote;
+EXTERN_C const CFStringRef kCTUIFontTextStyleShortCaption1;
+EXTERN_C const CFStringRef kCTUIFontTextStyleTallBody;
+
+EXTERN_C const CFStringRef kCTUIFontTextStyleHeadline;
+EXTERN_C const CFStringRef kCTUIFontTextStyleBody;
+EXTERN_C const CFStringRef kCTUIFontTextStyleSubhead;
+EXTERN_C const CFStringRef kCTUIFontTextStyleFootnote;
+EXTERN_C const CFStringRef kCTUIFontTextStyleCaption1;
+EXTERN_C const CFStringRef kCTUIFontTextStyleCaption2;
+
+EXTERN_C const CFStringRef kCTFontDescriptorTextStyleEmphasized;
+#endif
+
+EXTERN_C CTFontDescriptorRef CTFontDescriptorCreateForUIType(CTFontUIFontType, CGFloat size, CFStringRef language);
+EXTERN_C CTFontDescriptorRef CTFontDescriptorCreateWithTextStyle(CFStringRef style, CFStringRef size, CFStringRef language);
+EXTERN_C bool CTFontDescriptorIsSystemUIFont(CTFontDescriptorRef);
+
+#endif // CTFontDescriptorSPI_h
diff --git a/Source/WebCore/platform/spi/ios/CTFontSPI.h b/Source/WebCore/platform/spi/ios/CTFontSPI.h
new file mode 100644 (file)
index 0000000..1373d12
--- /dev/null
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 CTFontSPI_h
+#define CTFontSPI_h
+
+#include <CoreText/CoreText.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <CoreText/CTFontPriv.h>
+#else
+enum {
+    kCTFontUIFontSystemItalic = 27,
+    kCTFontUIFontSystemThin = 102,
+    kCTFontUIFontSystemLight = 103,
+    kCTFontUIFontSystemUltraLight = 104,
+};
+#endif
+
+EXTERN_C CTFontRef CTFontCreatePhysicalFontForCharactersWithLanguage(CTFontRef, const UTF16Char* characters, CFIndex length, CFStringRef language, CFIndex* coveredLength);
+EXTERN_C bool CTFontIsAppleColorEmoji(CTFontRef);
+EXTERN_C bool CTFontDescriptorIsSystemUIFont(CTFontDescriptorRef);
+EXTERN_C CTFontRef CTFontCreateForCSS(CFStringRef name, uint16_t weight, CTFontSymbolicTraits, CGFloat size);
+
+#endif // CTFontSPI_h
diff --git a/Source/WebCore/platform/spi/ios/CUICatalogSPI.h b/Source/WebCore/platform/spi/ios/CUICatalogSPI.h
new file mode 100644 (file)
index 0000000..b8df4d8
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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. 
+ */
+
+#import <CoreGraphics/CoreGraphics.h>
+#import <CoreText/CoreText.h>
+#import <Foundation/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <CoreUI/CUICatalog.h>
+#else
+@class CUIStyleEffectConfiguration;
+
+@interface CUICatalog : NSObject
+@end
+
+@interface CUICatalog (Details)
+- (BOOL)drawGlyphs:(const CGGlyph[])glyphs atPositions:(const CGPoint[])positions inContext:(CGContextRef)context withFont:(CTFontRef)font count:(NSUInteger)count stylePresetName:(NSString *)stylePresetName styleConfiguration:(CUIStyleEffectConfiguration *)styleConfiguration foregroundColor:(CGColorRef)foregroundColor;
+@end
+#endif
diff --git a/Source/WebCore/platform/spi/ios/CUIStyleEffectConfigurationSPI.h b/Source/WebCore/platform/spi/ios/CUIStyleEffectConfigurationSPI.h
new file mode 100644 (file)
index 0000000..1edc301
--- /dev/null
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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. 
+ */
+
+#import <Foundation/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <CoreUI/CUIStyleEffectConfiguration.h>
+#else
+@interface CUIStyleEffectConfiguration : NSObject <NSCopying>
+@end
+
+@interface CUIStyleEffectConfiguration (Details)
+@property (nonatomic) BOOL useSimplifiedEffect;
+@end
+#endif
diff --git a/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h b/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h
new file mode 100644 (file)
index 0000000..a564193
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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. 
+ */
+
+#import <Foundation/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <MediaPlayer/MPAVRoutingController.h>
+#else
+enum {
+    MPRouteDiscoveryModePresence = 1,
+    MPRouteDiscoveryModeDetailed = 2,
+};
+typedef NSInteger MPRouteDiscoveryMode;
+
+@interface MPAVRoutingController : NSObject
+@end
+
+@interface MPAVRoutingController (Details)
+- (instancetype)initWithName:(NSString *)name;
+@property (nonatomic, assign) MPRouteDiscoveryMode discoveryMode;
+@end
+#endif
diff --git a/Source/WebCore/platform/spi/ios/MobileGestaltSPI.h b/Source/WebCore/platform/spi/ios/MobileGestaltSPI.h
new file mode 100644 (file)
index 0000000..4962479
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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 MobileGestaltSPI_h
+#define MobileGestaltSPI_h
+
+#include <CoreFoundation/CoreFoundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <MobileGestalt.h>
+#else
+static const CFStringRef kMGQAppleInternalInstallCapability = CFSTR("apple-internal-install");
+static const CFStringRef kMGQMainScreenPitch = CFSTR("main-screen-pitch");
+static const CFStringRef kMGQMainScreenScale = CFSTR("main-screen-scale");
+#endif
+
+EXTERN_C CFTypeRef MGCopyAnswer(CFStringRef question, CFDictionaryRef options);
+
+#ifndef MGGetBoolAnswer
+EXTERN_C bool MGGetBoolAnswer(CFStringRef question);
+#endif
+
+#endif // MobileGestaltSPI_h
diff --git a/Source/WebCore/platform/spi/ios/QLPreviewConverterSPI.h b/Source/WebCore/platform/spi/ios/QLPreviewConverterSPI.h
new file mode 100644 (file)
index 0000000..6c507b1
--- /dev/null
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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. 
+ */
+
+#import <Foundation/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <QuickLook/QLPreviewConverter.h>
+#else
+@interface QLPreviewConverter : NSObject
+@end
+
+@interface QLPreviewConverter (Details)
+- (NSURLRequest *)safeRequestForRequest:(NSURLRequest *)request;
+- (id)initWithConnection:(NSURLConnection *)connection delegate:(id)delegate response:(NSURLResponse *)response options:(NSDictionary *)options;
+- (id)initWithData:(NSData *)data name:(NSString *)name uti:(NSString *)uti options:(NSDictionary *)options;
+- (void)appendDataArray:(NSArray *)dataArray;
+- (void)finishConverting;
+- (void)finishedAppendingData;
+@property (readonly, nonatomic) NSString *previewFileName;
+@property (readonly, nonatomic) NSString *previewUTI;
+@property (readonly, nonatomic) NSURLRequest *previewRequest;
+@property (readonly, nonatomic) NSURLResponse *previewResponse;
+@end
+#endif
diff --git a/Source/WebCore/platform/spi/ios/QuickLookSPI.h b/Source/WebCore/platform/spi/ios/QuickLookSPI.h
new file mode 100644 (file)
index 0000000..996a638
--- /dev/null
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014 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. ``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
+ * 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. 
+ */
+
+#import <Foundation/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <QuickLook/QuickLookPrivate.h>
+#endif
+
+EXTERN_C NSSet *QLPreviewGetSupportedMIMETypes();
+EXTERN_C NSString *QLTypeCopyBestMimeTypeForFileNameAndMimeType(NSString *fileName, NSString *mimeType);
+EXTERN_C NSString *QLTypeCopyBestMimeTypeForURLAndMimeType(NSURL *, NSString *mimeType);
+EXTERN_C NSString *QLTypeCopyUTIForURLAndMimeType(NSURL *, NSString *mimeType);
index 94e1bdb..71b9087 100644 (file)
@@ -30,6 +30,7 @@
 #import "CSSPrimitiveValue.h"
 #import "CSSToLengthConversionData.h"
 #import "CSSValueKeywords.h"
+#import "CTFontDescriptorSPI.h"
 #import "DateComponents.h"
 #import "Document.h"
 #import "FloatRoundedRect.h"
@@ -58,8 +59,7 @@
 #import "UserAgentScripts.h"
 #import "UserAgentStyleSheets.h"
 #import "WebCoreThreadRun.h"
-#import <CoreGraphics/CGPathPrivate.h>
-#import <CoreText/CTFontDescriptorPriv.h>
+#import <CoreGraphics/CoreGraphics.h>
 #import <objc/runtime.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/RefPtr.h>
@@ -81,14 +81,6 @@ SOFT_LINK_CONSTANT(UIKit, UIContentSizeCategoryDidChangeNotification, CFStringRe
 @implementation WebCoreRenderThemeBundle
 @end
 
-// This is a temporary hack to build on iOS. Should be removed as soon as CT fixes the header files.
-extern const CFStringRef kCTUIFontTextStyleShortHeadline CT_AVAILABLE(10_10, 7_0);
-extern const CFStringRef kCTUIFontTextStyleShortBody CT_AVAILABLE(10_10, 7_0);
-extern const CFStringRef kCTUIFontTextStyleShortSubhead CT_AVAILABLE(10_10, 7_0);
-extern const CFStringRef kCTUIFontTextStyleShortFootnote CT_AVAILABLE(10_10, 7_0);
-extern const CFStringRef kCTUIFontTextStyleShortCaption1 CT_AVAILABLE(10_10, 7_0);
-extern const CFStringRef kCTUIFontTextStyleTallBody CT_AVAILABLE(10_10, 7_0);
-
 namespace WebCore {
 
 const float ControlBaseHeight = 20;
index f012aaa..3c20125 100644 (file)
@@ -1,3 +1,14 @@
+2014-09-17  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Make WebCore build with public iOS SDK
+        https://bugs.webkit.org/show_bug.cgi?id=136487
+
+        Reviewed by David Kilzer.
+
+        Substitute <WebCore/CGFloatSPI.h> for <CoreGraphics/CGFloat.h>.
+
+        * WebCoreSupport/WebFixedPositionContent.mm:
+
 2014-09-05  Simon Fraser  <simon.fraser@apple.com>
 
         Remove some PLATFORM(IOS) code in Color.h/cpp
index fab7305..e6b3929 100644 (file)
@@ -29,6 +29,7 @@
 #import "WebFixedPositionContentInternal.h"
 
 #import "WebViewInternal.h"
+#import <WebCore/CGFloatSPI.h>
 #import <WebCore/ChromeClient.h>
 #import <WebCore/Frame.h>
 #import <WebCore/IntSize.h>
@@ -40,9 +41,8 @@
 #import <wtf/StdLibExtras.h>
 #import <wtf/Threading.h>
 
-#import <CoreGraphics/CGFloat.h>
-#import <QuartzCore/QuartzCore.h>
 #import <Foundation/Foundation.h>
+#import <QuartzCore/QuartzCore.h>
 #import <algorithm>
 
 using namespace WebCore;
index d2186b9..90fe46b 100644 (file)
@@ -1,3 +1,23 @@
+2014-09-17  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Make WebCore build with public iOS SDK
+        https://bugs.webkit.org/show_bug.cgi?id=136487
+
+        Reviewed by David Kilzer.
+
+        Update WebKit1 source files to include the wrapper SPI headers instead of the corresponding
+        actual SPI header(s).
+
+        * DOM/WebDOMOperationsPrivate.h:
+        * MigrateHeaders.make: Modified to only modify the include path of a "<WebCore/"-prefixed header
+        file if its filename doesn't end in "SPI.h" as an alternative to having MigrateHeaders.make copy
+        such files into the WebKit framework as private headers.
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        * WebInspector/WebNodeHighlight.mm:
+        * WebView/WebIndicateLayer.mm:
+        * WebView/WebRenderLayer.h:
+        * WebView/WebView.mm:
+
 2014-09-16  Daniel Bates  <dabates@apple.com>
 
         [iOS] Add iOS SDK name and version suffix to WebKitSystemInterface debug/release product name
index 7a0676e..40e02a7 100644 (file)
@@ -30,7 +30,7 @@
 #import <JavaScriptCore/JSBase.h>
 
 #if TARGET_OS_IPHONE
-#import <Foundation/NSGeometry.h>
+#import <WebCore/NSGeometrySPI.h>
 #else
 #import <AppKit/NSEvent.h>
 #import <WebKitLegacy/DOMWheelEvent.h>
index 9851d31..3885500 100644 (file)
@@ -241,8 +241,8 @@ all : \
     $(PRIVATE_HEADERS_DIR)/DOMGestureEvent.h
 endif
 
-WEBCORE_HEADER_REPLACE_RULES = -e s/\<WebCore/\<WebKitLegacy/ -e s/DOMDOMImplementation/DOMImplementation/ -e "s/(^ *)WEBCORE_EXPORT /\1/"
-WEBCORE_HEADER_MIGRATE_CMD = sed -E $(WEBCORE_HEADER_REPLACE_RULES) $< > $@
+WEBCORE_HEADER_REPLACE_RULES = 's/<WebCore/<WebKitLegacy/ if m|<WebCore/([^>]+)>| && $$1 !~ /SPI.h$$/; s/DOMDOMImplementation/DOMImplementation/; s/^(\s*)WEBCORE_EXPORT /$$1/;'
+WEBCORE_HEADER_MIGRATE_CMD = perl -p -e $(WEBCORE_HEADER_REPLACE_RULES) $< > $@
 
 $(PRIVATE_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make
        $(WEBCORE_HEADER_MIGRATE_CMD)
index c5f9e3a..5b1cc2b 100644 (file)
 #endif
 
 #if USE(QUICK_LOOK)
-#import <Foundation/NSFileManager_NSURLExtras.h>
 #import <WebCore/FileSystemIOS.h>
+#import <WebCore/NSFileManagerSPI.h>
 #import <WebCore/QuickLook.h>
 #import <WebCore/RuntimeApplicationChecksIOS.h>
 #endif
index 3587c38..e774e48 100644 (file)
  */
 
 #import "WebNodeHighlight.h"
+
 #import "WebNodeHighlightView.h"
 #import "WebNSViewExtras.h"
-
+#import <WebCore/CALayerSPI.h>
 #import <WebCore/InspectorController.h>
 #import <wtf/Assertions.h>
 
@@ -37,7 +38,6 @@
 #import "WebFramePrivate.h"
 #import "WebHTMLView.h"
 #import "WebView.h"
-#import <QuartzCore/CALayerPrivate.h>
 #import <WebCore/WAKWindow.h>
 #endif
 
index 2739034..e49271d 100644 (file)
@@ -29,7 +29,7 @@
 
 #import "WebFramePrivate.h"
 #import "WebView.h"
-#import <QuartzCore/CALayerPrivate.h>
+#import <WebCore/CALayerSPI.h>
 #import <WebCore/ColorMac.h>
 #import <WebCore/WAKWindow.h>
 
index 67e77f0..f5a439c 100644 (file)
@@ -26,7 +26,7 @@
 #import <Foundation/Foundation.h>
 
 #if TARGET_OS_IPHONE
-#import <Foundation/NSGeometry.h>
+#import <WebCore/NSGeometrySPI.h>
 #endif
 
 @class WebFrame;
index a6f3b54..7fd75db 100644 (file)
 #import "WebUIKitSupport.h"
 #import "WebVisiblePosition.h"
 #import <CFNetwork/CFURLCachePriv.h>
-#import <MobileGestalt.h>
+#import <WebCore/DispatchSPI.h>
 #import <WebCore/EventNames.h>
 #import <WebCore/FontCache.h>
 #import <WebCore/GraphicsLayer.h>
 #import <WebCore/IconController.h>
 #import <WebCore/LegacyTileCache.h>
+#import <WebCore/MobileGestaltSPI.h>
 #import <WebCore/NetworkStateNotifier.h>
 #import <WebCore/RuntimeApplicationChecksIOS.h>
 #import <WebCore/SQLiteDatabaseTracker.h>
 #import <WebCore/WebCoreThreadRun.h>
 #import <WebCore/WebEvent.h>
 #import <WebCore/WebVideoFullscreenControllerAVKit.h>
-#import <dispatch/private.h>
 #import <wtf/FastMalloc.h>
 #endif // !PLATFORM(IOS)
 
index a93e7cf..b8f4851 100644 (file)
@@ -1,3 +1,24 @@
+2014-09-17  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Make WebCore build with public iOS SDK
+        https://bugs.webkit.org/show_bug.cgi?id=136487
+
+        Reviewed by David Kilzer.
+
+        Update WebKit2 source files to include the wrapper SPI headers instead of the corresponding
+        actual SPI header(s).
+
+        * Platform/mac/SharedMemoryMac.cpp:
+        * Shared/ios/NativeWebTouchEventIOS.mm:
+        * Shared/mac/RemoteLayerBackingStore.mm:
+        * Shared/mac/RemoteLayerTreePropertyApplier.mm:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        * UIProcess/ios/WKPDFPageNumberIndicator.mm:
+        * UIProcess/ios/WKScrollView.mm:
+        * UIProcess/ios/WebMemoryPressureHandlerIOS.mm:
+        * UIProcess/ios/forms/WKAirPlayRoutePicker.mm:
+        * WebProcess/WebPage/WebPage.cpp:
+
 2014-09-17  Gavin Barraclough  <barraclough@apple.com>
 
         DOM timer throttling for hidden plugins
index ff7ab9f..c4ce321 100644 (file)
@@ -30,9 +30,9 @@
 #include "ArgumentEncoder.h"
 #include "Arguments.h"
 #include "MachPort.h"
+#include <WebCore/MachVMSPI.h>
 #include <mach/mach_error.h>
 #include <mach/mach_port.h>
-#include <mach/mach_vm.h>
 #include <mach/vm_map.h>
 #include <wtf/RefPtr.h>
 
index 4a1ee49..0e8716f 100644 (file)
 #import "NativeWebTouchEvent.h"
 
 #if PLATFORM(IOS)
-
 #import "WebEvent.h"
-#import <Foundation/NSGeometry.h>
 #import <UIKit/UITouch.h>
 #import <UIKit/UIWebTouchEventsGestureRecognizer.h>
 #import <WebCore/IntPoint.h>
+#import <WebCore/NSGeometrySPI.h>
 #import <wtf/CurrentTime.h>
 
 namespace WebKit {
index 99078ed..7d04195 100644 (file)
@@ -34,6 +34,7 @@
 #import "ShareableBitmap.h"
 #import "WebCoreArgumentCoders.h"
 #import <QuartzCore/QuartzCore.h>
+#import <WebCore/CALayerSPI.h>
 #import <WebCore/GraphicsContextCG.h>
 #import <WebCore/IOSurface.h>
 #import <WebCore/IOSurfacePool.h>
 #import <mach/mach_port.h>
 #endif
 
-#if __has_include(<QuartzCore/CALayerPrivate.h>)
-#import <QuartzCore/CALayerPrivate.h>
-#endif
-
-@interface CALayer (Details)
-@property BOOL contentsOpaque;
-@end
-
 using namespace WebCore;
 
 namespace WebKit {
index 80613f6..fd45c94 100644 (file)
@@ -31,6 +31,7 @@
 #import "RemoteLayerTreeHost.h"
 #import <QuartzCore/CALayer.h>
 #import <WebCore/BlockExceptions.h>
+#import <WebCore/CALayerSPI.h>
 #import <WebCore/PlatformCAFilters.h>
 #import <WebCore/ScrollbarThemeMac.h>
 
 #import <UIKit/UIView.h>
 #endif
 
-#if __has_include(<QuartzCore/CALayerPrivate.h>)
-#import <QuartzCore/CALayerPrivate.h>
-#endif
-
-@interface CALayer (Details)
-@property BOOL contentsOpaque;
-@end
-
 #if PLATFORM(IOS)
 @interface UIView (WKUIViewUtilities)
 - (void)_web_setSubviews:(NSArray *)subviews;
index 3a6bcd7..9fdfbde 100644 (file)
@@ -88,7 +88,6 @@
 #import "WKScrollView.h"
 #import "WKWebViewContentProviderRegistry.h"
 #import "WebPageMessages.h"
-#import <CoreGraphics/CGFloat.h>
 #import <CoreGraphics/CGPDFDocumentPrivate.h>
 #import <UIKit/UIApplication.h>
 #import <UIKit/UIDevice_Private.h>
@@ -96,6 +95,8 @@
 #import <UIKit/UIWindow_Private.h>
 #import <QuartzCore/CARenderServer.h>
 #import <QuartzCore/QuartzCorePrivate.h>
+#import <WebCore/CALayerSPI.h>
+#import <WebCore/CGFloatSPI.h>
 #import <WebCore/InspectorOverlay.h>
 
 @interface UIScrollView (UIScrollViewInternal)
index cfa3005..81ade5a 100644 (file)
 #if PLATFORM(IOS)
 
 #import <QuartzCore/CAFilter.h>
-#import <QuartzCore/CALayerPrivate.h>
 #import <UIKit/UIGeometry_Private.h>
 #import <UIKit/UIKit.h>
 #import <UIKit/UIView_Private.h>
 #import <UIKit/_UIBackdropView_Private.h>
+#import <WebCore/CALayerSPI.h>
 #import <WebCore/LocalizedStrings.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/text/WTFString.h>
index 7d5a2f2..9c0d521 100644 (file)
@@ -29,7 +29,7 @@
 #if PLATFORM(IOS)
 
 #import "WKWebViewInternal.h"
-#import <CoreGraphics/CGFloat.h>
+#import <WebCore/CGFloatSPI.h>
 
 @interface UIScrollView (UIScrollViewInternalHack)
 - (CGFloat)_rubberBandOffsetForOffset:(CGFloat)newOffset maxOffset:(CGFloat)maxOffset minOffset:(CGFloat)minOffset range:(CGFloat)range outside:(BOOL *)outside;
index 523d0c8..bdd2363 100644 (file)
@@ -29,7 +29,7 @@
 #if PLATFORM(IOS)
 
 #import "ViewSnapshotStore.h"
-#import <dispatch/private.h>
+#import <WebCore/DispatchSPI.h>
 
 namespace WebKit {
 
index d25e287..8e3374b 100644 (file)
@@ -32,9 +32,9 @@
 #import "WKContentViewInteraction.h"
 #import "WebPageProxy.h"
 #import <MediaPlayer/MPAVItem.h>
-#import <MediaPlayer/MPAVRoutingController.h>
-#import <MediaPlayer/MPAudioVideoRoutingPopoverController.h>
 #import <MediaPlayer/MPAudioVideoRoutingActionSheet.h>
+#import <MediaPlayer/MPAudioVideoRoutingPopoverController.h>
+#import <WebCore/MPAVRoutingControllerSPI.h>
 #import <WebCore/SoftLinking.h>
 #import <UIKit/UIApplication_Private.h>
 #import <UIKit/UIWindow_Private.h>
index 96e55aa..25aa8e9 100644 (file)
 #include "RemoteLayerTreeDrawingArea.h"
 #include "WebVideoFullscreenManager.h"
 #include <CoreGraphics/CoreGraphics.h>
-#include <CoreText/CTFontDescriptorPriv.h>
-#include <CoreText/CTFontPriv.h>
+#include <WebCore/CTFontDescriptorSPI.h>
+#include <WebCore/CTFontSPI.h>
 #include <WebCore/Icon.h>
 #endif
 
index 5fa51c3..623ad26 100644 (file)
@@ -1,3 +1,14 @@
+2014-09-17  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Make WebCore build with public iOS SDK
+        https://bugs.webkit.org/show_bug.cgi?id=136487
+
+        Reviewed by David Kilzer.
+
+        Substitute <WebCore/MachVMSPI.h> for <mach/mach_vm.h>.
+
+        * DumpRenderTree/mac/CheckedMalloc.cpp:
+
 2014-09-17  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] WebKitWebView::load-failed-with-tls-errors should receive the failing URI instead of a host
index ac8887e..a461d30 100644 (file)
@@ -31,8 +31,8 @@
 #import "config.h" 
 #import "CheckedMalloc.h"
 
+#import <WebCore/MachVMSPI.h>
 #import <mach/mach_init.h>
-#import <mach/mach_vm.h>
 #import <mach/vm_region.h>
 #import <malloc/malloc.h>
 #import <unistd.h>