[PAL] Move spi/cocoa and spi/cg directories into PAL

https://bugs.webkit.org/show_bug.cgi?id=175175

Patch by Yoshiaki Jitsukawa <Yoshiaki.Jitsukawa@sony.com> on 2017-08-09
Reviewed by Myles C. Maxfield.

Source/WebCore:

* Modules/applepay/cocoa/PaymentCocoa.mm:
* Modules/applepay/cocoa/PaymentContactCocoa.mm:
* Modules/applepay/cocoa/PaymentMerchantSessionCocoa.mm:
* Modules/applepay/cocoa/PaymentMethodCocoa.mm:
* PlatformAppleWin.cmake:
* WebCore.xcodeproj/project.pbxproj:
* editing/cocoa/EditorCocoa.mm:
* editing/cocoa/HTMLConverter.mm:
* editing/ios/EditorIOS.mm:
* page/cocoa/ResourceUsageThreadCocoa.mm:
* page/mac/TextIndicatorWindow.mm:
* platform/cocoa/ContentFilterUnblockHandlerCocoa.mm:
* platform/cocoa/DataDetectorsCoreSoftLink.h:
* platform/cocoa/MIMETypeRegistryCocoa.mm:
* platform/cocoa/NetworkExtensionContentFilter.mm:
* platform/cocoa/ParentalControlsContentFilter.mm:
* platform/cocoa/SleepDisablerCocoa.cpp:
* platform/graphics/Font.cpp:
* platform/graphics/Font.h:
* platform/graphics/avfoundation/objc/AVAssetTrackUtilities.mm:
* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
* platform/graphics/avfoundation/objc/VideoFullscreenLayerManager.mm:
* platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.mm:
* platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm:
* platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
* platform/graphics/cg/ColorCG.cpp:
* platform/graphics/cg/GraphicsContextCG.cpp:
* platform/graphics/cg/ImageBufferCG.cpp:
* platform/graphics/cg/ImageBufferDataCG.cpp:
* platform/graphics/cg/ImageDecoderCG.cpp:
* platform/graphics/cg/NativeImageCG.cpp:
* platform/graphics/cocoa/FontCacheCoreText.cpp:
* platform/graphics/cocoa/FontCascadeCocoa.mm:
* platform/graphics/cocoa/FontCocoa.mm:
* platform/graphics/cocoa/FontDescriptionCocoa.cpp:
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
* platform/graphics/cocoa/IOSurface.mm:
* platform/graphics/cocoa/TextTrackRepresentationCocoa.mm:
* platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h:
* platform/graphics/ios/FontAntialiasingStateSaver.h:
* platform/graphics/ios/FontCacheIOS.mm:
* platform/graphics/mac/ComplexTextControllerCoreText.mm:
* platform/graphics/mac/FontCacheMac.mm:
* platform/graphics/mac/GlyphPageMac.cpp:
* platform/graphics/win/FontCacheWin.cpp:
* platform/ios/LegacyTileCache.mm:
* platform/ios/LegacyTileGrid.mm:
* platform/ios/LegacyTileGridTile.mm:
* platform/ios/PlaybackSessionInterfaceAVKit.mm:
* platform/ios/QuickLook.mm:
* platform/ios/VideoFullscreenInterfaceAVKit.mm:
* platform/ios/WebAVPlayerController.h:
* platform/ios/WebAVPlayerController.mm:
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
* platform/ios/wak/WKGraphics.mm:
* platform/mac/DragImageMac.mm:
* platform/mac/PlatformScreenMac.mm:
* platform/mac/PlaybackSessionInterfaceMac.mm:
* platform/mac/ThemeMac.mm:
* platform/mac/VideoFullscreenInterfaceMac.mm:
* platform/mac/WebPlaybackControlsManager.h:
* platform/mac/WebVideoFullscreenHUDWindowController.mm:
* platform/network/cocoa/CookieStorageObserver.mm:
* platform/network/cocoa/NetworkLoadMetrics.mm:
* platform/network/mac/AuthenticationMac.mm:
* platform/network/mac/ResourceHandleMac.mm:
* platform/spi/ios/DataDetectorsUISPI.h:
* platform/spi/mac/DataDetectorsSPI.h:
* platform/spi/mac/NSViewSPI.h:
* rendering/RenderThemeCocoa.mm:
* rendering/RenderThemeIOS.mm:
* rendering/RenderThemeMac.mm:

Source/WebCore/PAL:

* PAL.xcodeproj/project.pbxproj:
* pal/PlatformAppleWin.cmake:
* pal/spi/cg/CoreGraphicsSPI.h: Renamed from Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h.
(CGFloatMin):
* pal/spi/cg/ImageIOSPI.h: Renamed from Source/WebCore/platform/spi/cg/ImageIOSPI.h.
* pal/spi/cocoa/AVKitSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/AVKitSPI.h.
(-[AVTouchBarPlaybackControlsControlling NS_ENUM]):
* pal/spi/cocoa/CFNSURLConnectionSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/CFNSURLConnectionSPI.h.
* pal/spi/cocoa/CoreTextSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/CoreTextSPI.h.
* pal/spi/cocoa/DataDetectorsCoreSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h.
* pal/spi/cocoa/IOPMLibSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h.
* pal/spi/cocoa/IOPSLibSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/IOPSLibSPI.h.
* pal/spi/cocoa/IOReturnSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/IOReturnSPI.h.
* pal/spi/cocoa/IOSurfaceSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h.
* pal/spi/cocoa/IOTypesSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/IOTypesSPI.h.
* pal/spi/cocoa/LinkPresentationSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/LinkPresentationSPI.h.
* pal/spi/cocoa/MachVMSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/MachVMSPI.h.
* pal/spi/cocoa/NEFilterSourceSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h.
* pal/spi/cocoa/NSAttributedStringSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSAttributedStringSPI.h.
* pal/spi/cocoa/NSButtonCellSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSButtonCellSPI.h.
* pal/spi/cocoa/NSCalendarDateSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSCalendarDateSPI.h.
* pal/spi/cocoa/NSColorSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSColorSPI.h.
* pal/spi/cocoa/NSExtensionSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSExtensionSPI.h.
* pal/spi/cocoa/NSFileManagerSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSFileManagerSPI.h.
* pal/spi/cocoa/NSStringSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSStringSPI.h.
* pal/spi/cocoa/NSTouchBarSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h.
* pal/spi/cocoa/NSURLConnectionSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h.
* pal/spi/cocoa/NSURLDownloadSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h.
* pal/spi/cocoa/NSURLFileTypeMappingsSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSURLFileTypeMappingsSPI.h.
* pal/spi/cocoa/PassKitSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/PassKitSPI.h.
(NS_ERROR_ENUM):
* pal/spi/cocoa/QuartzCoreSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h.
* pal/spi/cocoa/ServersSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/ServersSPI.h.
* pal/spi/cocoa/WebFilterEvaluatorSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/WebFilterEvaluatorSPI.h.
* pal/spi/cocoa/pthreadSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/pthreadSPI.h.

Source/WebKit:

* NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm:
* NetworkProcess/Downloads/mac/DownloadMac.mm:
* Platform/cocoa/SharedMemoryCocoa.cpp:
* Platform/mac/LayerHostingContext.mm:
* Shared/Cocoa/DataDetectionResult.mm:
* Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:
* Shared/cf/CookieStorageUtilsCF.mm:
* Shared/ios/InteractionInformationAtPosition.mm:
* Shared/mac/HangDetectionDisablerMac.mm:
* Shared/mac/RemoteLayerBackingStore.mm:
* Shared/mac/RemoteLayerTreePropertyApplier.mm:
* UIProcess/API/Cocoa/WKWebView.mm:
* UIProcess/API/mac/WKView.mm:
* UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h:
* UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
* UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm:
* UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
* UIProcess/ios/ViewGestureControllerIOS.mm:
* UIProcess/ios/WKContentView.mm:
* UIProcess/ios/WKContentViewInteraction.mm:
* UIProcess/ios/WKPDFPageNumberIndicator.mm:
* UIProcess/ios/WKScrollView.mm:
* UIProcess/mac/RemoteLayerTreeHost.mm:
* UIProcess/mac/ServicesController.mm:
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
* UIProcess/mac/ViewGestureControllerMac.mm:
* UIProcess/mac/ViewSnapshotStore.mm:
* UIProcess/mac/WKViewLayoutStrategy.mm:
* WebProcess/Plugins/PDF/PDFPlugin.mm:
* WebProcess/WebPage/WebPage.cpp:
* WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
* WebProcess/cocoa/WebProcessCocoa.mm:

Source/WebKitLegacy/ios:

* Misc/WebNSStringExtrasIOS.m:
* WebCoreSupport/WebFixedPositionContent.mm:

Source/WebKitLegacy/mac:

* History/WebHistory.mm:
* Misc/WebDownload.mm:
* Misc/WebKitNSStringExtras.mm:
* Plugins/Hosted/NetscapePluginHostManager.mm:
* Plugins/WebPluginDatabase.mm:
* WebCoreSupport/WebFrameLoaderClient.mm:
* WebInspector/WebNodeHighlight.mm:
* WebView/WebHTMLView.mm:
* WebView/WebIndicateLayer.mm:
* WebView/WebView.mm:
* WebView/WebViewData.h:

Tools:

* DumpRenderTree/ios/PixelDumpSupportIOS.mm:
* DumpRenderTree/mac/DumpRenderTree.mm:
* TestWebKitAPI/Tests/WebKit2Cocoa/NSFileManagerExtras.mm:
* WebKitTestRunner/ios/PlatformWebViewIOS.mm:

* Scripts/webkitpy/style/checker.py:
* Scripts/webkitpy/style/checker_unittest.py:
(GlobalVariablesTest.test_path_rules_specifier):

Add path rules specifiers for PassKitSPI.h and DataDetectorsCoreSPI.h

* Scripts/webkitpy/style/checkers/cpp.py:
(check_braces):
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(WebKitStyleTest.test_braces.CF_OPTIONS):
(WebKitStyleTest.test_braces):

Prevent CF_OPTIONS() from being handled as funtion definition.

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 130e4f0ff2dc0fed81f722200b72d4f40803a1a8..ba290dd495916ad32c509b5ce52a9f9161a7a2b3 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,84 @@
+2017-08-09  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [PAL] Move spi/cocoa and spi/cg directories into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175175
+
+        Reviewed by Myles C. Maxfield.
+
+        * Modules/applepay/cocoa/PaymentCocoa.mm:
+        * Modules/applepay/cocoa/PaymentContactCocoa.mm:
+        * Modules/applepay/cocoa/PaymentMerchantSessionCocoa.mm:
+        * Modules/applepay/cocoa/PaymentMethodCocoa.mm:
+        * PlatformAppleWin.cmake:
+        * WebCore.xcodeproj/project.pbxproj:
+        * editing/cocoa/EditorCocoa.mm:
+        * editing/cocoa/HTMLConverter.mm:
+        * editing/ios/EditorIOS.mm:
+        * page/cocoa/ResourceUsageThreadCocoa.mm:
+        * page/mac/TextIndicatorWindow.mm:
+        * platform/cocoa/ContentFilterUnblockHandlerCocoa.mm:
+        * platform/cocoa/DataDetectorsCoreSoftLink.h:
+        * platform/cocoa/MIMETypeRegistryCocoa.mm:
+        * platform/cocoa/NetworkExtensionContentFilter.mm:
+        * platform/cocoa/ParentalControlsContentFilter.mm:
+        * platform/cocoa/SleepDisablerCocoa.cpp:
+        * platform/graphics/Font.cpp:
+        * platform/graphics/Font.h:
+        * platform/graphics/avfoundation/objc/AVAssetTrackUtilities.mm:
+        * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        * platform/graphics/avfoundation/objc/VideoFullscreenLayerManager.mm:
+        * platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.mm:
+        * platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm:
+        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+        * platform/graphics/cg/ColorCG.cpp:
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        * platform/graphics/cg/ImageBufferDataCG.cpp:
+        * platform/graphics/cg/ImageDecoderCG.cpp:
+        * platform/graphics/cg/NativeImageCG.cpp:
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        * platform/graphics/cocoa/FontCascadeCocoa.mm:
+        * platform/graphics/cocoa/FontCocoa.mm:
+        * platform/graphics/cocoa/FontDescriptionCocoa.cpp:
+        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+        * platform/graphics/cocoa/IOSurface.mm:
+        * platform/graphics/cocoa/TextTrackRepresentationCocoa.mm:
+        * platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h:
+        * platform/graphics/ios/FontAntialiasingStateSaver.h:
+        * platform/graphics/ios/FontCacheIOS.mm:
+        * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+        * platform/graphics/mac/FontCacheMac.mm:
+        * platform/graphics/mac/GlyphPageMac.cpp:
+        * platform/graphics/win/FontCacheWin.cpp:
+        * platform/ios/LegacyTileCache.mm:
+        * platform/ios/LegacyTileGrid.mm:
+        * platform/ios/LegacyTileGridTile.mm:
+        * platform/ios/PlaybackSessionInterfaceAVKit.mm:
+        * platform/ios/QuickLook.mm:
+        * platform/ios/VideoFullscreenInterfaceAVKit.mm:
+        * platform/ios/WebAVPlayerController.h:
+        * platform/ios/WebAVPlayerController.mm:
+        * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+        * platform/ios/wak/WKGraphics.mm:
+        * platform/mac/DragImageMac.mm:
+        * platform/mac/PlatformScreenMac.mm:
+        * platform/mac/PlaybackSessionInterfaceMac.mm:
+        * platform/mac/ThemeMac.mm:
+        * platform/mac/VideoFullscreenInterfaceMac.mm:
+        * platform/mac/WebPlaybackControlsManager.h:
+        * platform/mac/WebVideoFullscreenHUDWindowController.mm:
+        * platform/network/cocoa/CookieStorageObserver.mm:
+        * platform/network/cocoa/NetworkLoadMetrics.mm:
+        * platform/network/mac/AuthenticationMac.mm:
+        * platform/network/mac/ResourceHandleMac.mm:
+        * platform/spi/ios/DataDetectorsUISPI.h:
+        * platform/spi/mac/DataDetectorsSPI.h:
+        * platform/spi/mac/NSViewSPI.h:
+        * rendering/RenderThemeCocoa.mm:
+        * rendering/RenderThemeIOS.mm:
+        * rendering/RenderThemeMac.mm:
+
 2017-08-09  Don Olmstead  <don.olmstead@sony.com>
 
         [WTF] Move TextStream into WTF

diff --git a/Source/WebCore/Modules/applepay/cocoa/PaymentCocoa.mm b/Source/WebCore/Modules/applepay/cocoa/PaymentCocoa.mm
index 90fbf078022955e7ea6774da5d71f31a2f1d8ee7..99387b9c0821eb204fe1b7efdfcd1b36997eb056 100644 (file)
--- a/Source/WebCore/Modules/applepay/cocoa/PaymentCocoa.mm
+++ b/Source/WebCore/Modules/applepay/cocoa/PaymentCocoa.mm
@@ -29,9 +29,9 @@
 #if ENABLE(APPLE_PAY)
 
 #import "ApplePayPayment.h"
-#import "PassKitSPI.h"
 #import "PaymentContact.h"
 #import "PaymentMethod.h"
+#import <pal/spi/cocoa/PassKitSPI.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm b/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm
index dc0e37cde8ed5b51b5744af3aabc4471b37a1397..cc6697ffa30685ecd1a023513c1a7fdbfe5e8aeb 100644 (file)
--- a/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm
+++ b/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm
@@ -29,8 +29,8 @@
 #if ENABLE(APPLE_PAY)
 
 #import "ApplePayPaymentContact.h"
-#import "PassKitSPI.h"
 #import <Contacts/Contacts.h>
+#import <pal/spi/cocoa/PassKitSPI.h>
 #import <wtf/SoftLinking.h>
 #import <wtf/text/StringBuilder.h>
 

diff --git a/Source/WebCore/Modules/applepay/cocoa/PaymentMerchantSessionCocoa.mm b/Source/WebCore/Modules/applepay/cocoa/PaymentMerchantSessionCocoa.mm
index 7229716a2670e6ccddafa8b4b209da7536cb0742..22ed3048301725b901abb307934c7897abf68268 100644 (file)
--- a/Source/WebCore/Modules/applepay/cocoa/PaymentMerchantSessionCocoa.mm
+++ b/Source/WebCore/Modules/applepay/cocoa/PaymentMerchantSessionCocoa.mm
@@ -28,7 +28,7 @@
 
 #if ENABLE(APPLE_PAY)
 
-#import "PassKitSPI.h"
+#import <pal/spi/cocoa/PassKitSPI.h>
 #import <runtime/JSONObject.h>
 #import <wtf/SoftLinking.h>
 

diff --git a/Source/WebCore/Modules/applepay/cocoa/PaymentMethodCocoa.mm b/Source/WebCore/Modules/applepay/cocoa/PaymentMethodCocoa.mm
index 121a966ff6ae6940e0bfa626bd92f8754fb08cdb..ad0859ea4e7c2224e3de1e3ebc97ea33e6258f41 100644 (file)
--- a/Source/WebCore/Modules/applepay/cocoa/PaymentMethodCocoa.mm
+++ b/Source/WebCore/Modules/applepay/cocoa/PaymentMethodCocoa.mm
@@ -29,7 +29,7 @@
 #if ENABLE(APPLE_PAY)
 
 #import "ApplePayPaymentMethod.h"
-#import "PassKitSPI.h"
+#import <pal/spi/cocoa/PassKitSPI.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
index bd79fffb6a5c5af39186fd68566c4ffa4b2c6f33..9b73a9ad02bc9a48e818a8ddb023c82eb3b44bd0 100644 (file)
--- a/Source/WebCore/PAL/ChangeLog
+++ b/Source/WebCore/PAL/ChangeLog
@@ -1,3 +1,46 @@
+2017-08-09  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [PAL] Move spi/cocoa and spi/cg directories into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175175
+
+        Reviewed by Myles C. Maxfield.
+
+        * PAL.xcodeproj/project.pbxproj:
+        * pal/PlatformAppleWin.cmake:
+        * pal/spi/cg/CoreGraphicsSPI.h: Renamed from Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h.
+        (CGFloatMin):
+        * pal/spi/cg/ImageIOSPI.h: Renamed from Source/WebCore/platform/spi/cg/ImageIOSPI.h.
+        * pal/spi/cocoa/AVKitSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/AVKitSPI.h.
+        (-[AVTouchBarPlaybackControlsControlling NS_ENUM]):
+        * pal/spi/cocoa/CFNSURLConnectionSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/CFNSURLConnectionSPI.h.
+        * pal/spi/cocoa/CoreTextSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/CoreTextSPI.h.
+        * pal/spi/cocoa/DataDetectorsCoreSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h.
+        * pal/spi/cocoa/IOPMLibSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h.
+        * pal/spi/cocoa/IOPSLibSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/IOPSLibSPI.h.
+        * pal/spi/cocoa/IOReturnSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/IOReturnSPI.h.
+        * pal/spi/cocoa/IOSurfaceSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h.
+        * pal/spi/cocoa/IOTypesSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/IOTypesSPI.h.
+        * pal/spi/cocoa/LinkPresentationSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/LinkPresentationSPI.h.
+        * pal/spi/cocoa/MachVMSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/MachVMSPI.h.
+        * pal/spi/cocoa/NEFilterSourceSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h.
+        * pal/spi/cocoa/NSAttributedStringSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSAttributedStringSPI.h.
+        * pal/spi/cocoa/NSButtonCellSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSButtonCellSPI.h.
+        * pal/spi/cocoa/NSCalendarDateSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSCalendarDateSPI.h.
+        * pal/spi/cocoa/NSColorSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSColorSPI.h.
+        * pal/spi/cocoa/NSExtensionSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSExtensionSPI.h.
+        * pal/spi/cocoa/NSFileManagerSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSFileManagerSPI.h.
+        * pal/spi/cocoa/NSStringSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSStringSPI.h.
+        * pal/spi/cocoa/NSTouchBarSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h.
+        * pal/spi/cocoa/NSURLConnectionSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h.
+        * pal/spi/cocoa/NSURLDownloadSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h.
+        * pal/spi/cocoa/NSURLFileTypeMappingsSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/NSURLFileTypeMappingsSPI.h.
+        * pal/spi/cocoa/PassKitSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/PassKitSPI.h.
+        (NS_ERROR_ENUM):
+        * pal/spi/cocoa/QuartzCoreSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h.
+        * pal/spi/cocoa/ServersSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/ServersSPI.h.
+        * pal/spi/cocoa/WebFilterEvaluatorSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/WebFilterEvaluatorSPI.h.
+        * pal/spi/cocoa/pthreadSPI.h: Renamed from Source/WebCore/platform/spi/cocoa/pthreadSPI.h.
+
 2017-08-09  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         [iOS DnD] ENABLE_DRAG_SUPPORT should be turned off for iOS 10 and enabled by default

diff --git a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
index 621b0c3abfb390849ce299af0f754d3372dee1f7..8e5e7f5fe91fb162da5a5300c5afbeab09022030 100644 (file)
--- a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
+++ b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
@@ -28,6 +28,36 @@
                0C2DA0701F33CA8400DBC317 /* CFUtilitiesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA06A1F33CA8400DBC317 /* CFUtilitiesSPI.h */; };
                0C2DA0711F33CA8400DBC317 /* CoreAudioSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA06B1F33CA8400DBC317 /* CoreAudioSPI.h */; };
                0C2DA0721F33CA8400DBC317 /* CoreMediaSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA06C1F33CA8400DBC317 /* CoreMediaSPI.h */; };
+               0C2DA11E1F3BE9E000DBC317 /* CoreGraphicsSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA11C1F3BE9E000DBC317 /* CoreGraphicsSPI.h */; };
+               0C2DA11F1F3BE9E000DBC317 /* ImageIOSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA11D1F3BE9E000DBC317 /* ImageIOSPI.h */; };
+               0C2DA13E1F3BEB4900DBC317 /* AVKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1221F3BEB4900DBC317 /* AVKitSPI.h */; };
+               0C2DA13F1F3BEB4900DBC317 /* CFNSURLConnectionSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1231F3BEB4900DBC317 /* CFNSURLConnectionSPI.h */; };
+               0C2DA1401F3BEB4900DBC317 /* CoreTextSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1241F3BEB4900DBC317 /* CoreTextSPI.h */; };
+               0C2DA1411F3BEB4900DBC317 /* DataDetectorsCoreSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1251F3BEB4900DBC317 /* DataDetectorsCoreSPI.h */; };
+               0C2DA1421F3BEB4900DBC317 /* IOPMLibSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1261F3BEB4900DBC317 /* IOPMLibSPI.h */; };
+               0C2DA1431F3BEB4900DBC317 /* IOPSLibSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1271F3BEB4900DBC317 /* IOPSLibSPI.h */; };
+               0C2DA1441F3BEB4900DBC317 /* IOReturnSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1281F3BEB4900DBC317 /* IOReturnSPI.h */; };
+               0C2DA1451F3BEB4900DBC317 /* IOSurfaceSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1291F3BEB4900DBC317 /* IOSurfaceSPI.h */; };
+               0C2DA1461F3BEB4900DBC317 /* IOTypesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA12A1F3BEB4900DBC317 /* IOTypesSPI.h */; };
+               0C2DA1471F3BEB4900DBC317 /* LinkPresentationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA12B1F3BEB4900DBC317 /* LinkPresentationSPI.h */; };
+               0C2DA1481F3BEB4900DBC317 /* MachVMSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA12C1F3BEB4900DBC317 /* MachVMSPI.h */; };
+               0C2DA1491F3BEB4900DBC317 /* NEFilterSourceSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA12D1F3BEB4900DBC317 /* NEFilterSourceSPI.h */; };
+               0C2DA14A1F3BEB4900DBC317 /* NSAttributedStringSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA12E1F3BEB4900DBC317 /* NSAttributedStringSPI.h */; };
+               0C2DA14B1F3BEB4900DBC317 /* NSButtonCellSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA12F1F3BEB4900DBC317 /* NSButtonCellSPI.h */; };
+               0C2DA14C1F3BEB4900DBC317 /* NSCalendarDateSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1301F3BEB4900DBC317 /* NSCalendarDateSPI.h */; };
+               0C2DA14D1F3BEB4900DBC317 /* NSColorSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1311F3BEB4900DBC317 /* NSColorSPI.h */; };
+               0C2DA14E1F3BEB4900DBC317 /* NSExtensionSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1321F3BEB4900DBC317 /* NSExtensionSPI.h */; };
+               0C2DA14F1F3BEB4900DBC317 /* NSFileManagerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1331F3BEB4900DBC317 /* NSFileManagerSPI.h */; };
+               0C2DA1501F3BEB4900DBC317 /* NSStringSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1341F3BEB4900DBC317 /* NSStringSPI.h */; };
+               0C2DA1511F3BEB4900DBC317 /* NSTouchBarSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1351F3BEB4900DBC317 /* NSTouchBarSPI.h */; };
+               0C2DA1521F3BEB4900DBC317 /* NSURLConnectionSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1361F3BEB4900DBC317 /* NSURLConnectionSPI.h */; };
+               0C2DA1531F3BEB4900DBC317 /* NSURLDownloadSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1371F3BEB4900DBC317 /* NSURLDownloadSPI.h */; };
+               0C2DA1541F3BEB4900DBC317 /* NSURLFileTypeMappingsSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1381F3BEB4900DBC317 /* NSURLFileTypeMappingsSPI.h */; };
+               0C2DA1551F3BEB4900DBC317 /* PassKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA1391F3BEB4900DBC317 /* PassKitSPI.h */; };
+               0C2DA1561F3BEB4900DBC317 /* pthreadSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA13A1F3BEB4900DBC317 /* pthreadSPI.h */; };
+               0C2DA1571F3BEB4900DBC317 /* QuartzCoreSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA13B1F3BEB4900DBC317 /* QuartzCoreSPI.h */; };
+               0C2DA1581F3BEB4900DBC317 /* ServersSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA13C1F3BEB4900DBC317 /* ServersSPI.h */; };
+               0C2DA1591F3BEB4900DBC317 /* WebFilterEvaluatorSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA13D1F3BEB4900DBC317 /* WebFilterEvaluatorSPI.h */; };
                1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C09D0521E31C44100725F18 /* CryptoDigest.h */; };
                1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C09D0551E31C46500725F18 /* CryptoDigestCommonCrypto.cpp */; };
                1C09D0581E31C57E00725F18 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C09D0571E31C57E00725F18 /* config.h */; };
@@ -57,6 +87,36 @@
                0C2DA06A1F33CA8400DBC317 /* CFUtilitiesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CFUtilitiesSPI.h; path = spi/cf/CFUtilitiesSPI.h; sourceTree = "<group>"; };
                0C2DA06B1F33CA8400DBC317 /* CoreAudioSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreAudioSPI.h; path = spi/cf/CoreAudioSPI.h; sourceTree = "<group>"; };
                0C2DA06C1F33CA8400DBC317 /* CoreMediaSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreMediaSPI.h; path = spi/cf/CoreMediaSPI.h; sourceTree = "<group>"; };
+               0C2DA11C1F3BE9E000DBC317 /* CoreGraphicsSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreGraphicsSPI.h; path = spi/cg/CoreGraphicsSPI.h; sourceTree = "<group>"; };
+               0C2DA11D1F3BE9E000DBC317 /* ImageIOSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ImageIOSPI.h; path = spi/cg/ImageIOSPI.h; sourceTree = "<group>"; };
+               0C2DA1221F3BEB4900DBC317 /* AVKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AVKitSPI.h; path = spi/cocoa/AVKitSPI.h; sourceTree = "<group>"; };
+               0C2DA1231F3BEB4900DBC317 /* CFNSURLConnectionSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CFNSURLConnectionSPI.h; path = spi/cocoa/CFNSURLConnectionSPI.h; sourceTree = "<group>"; };
+               0C2DA1241F3BEB4900DBC317 /* CoreTextSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreTextSPI.h; path = spi/cocoa/CoreTextSPI.h; sourceTree = "<group>"; };
+               0C2DA1251F3BEB4900DBC317 /* DataDetectorsCoreSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DataDetectorsCoreSPI.h; path = spi/cocoa/DataDetectorsCoreSPI.h; sourceTree = "<group>"; };
+               0C2DA1261F3BEB4900DBC317 /* IOPMLibSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOPMLibSPI.h; path = spi/cocoa/IOPMLibSPI.h; sourceTree = "<group>"; };
+               0C2DA1271F3BEB4900DBC317 /* IOPSLibSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOPSLibSPI.h; path = spi/cocoa/IOPSLibSPI.h; sourceTree = "<group>"; };
+               0C2DA1281F3BEB4900DBC317 /* IOReturnSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOReturnSPI.h; path = spi/cocoa/IOReturnSPI.h; sourceTree = "<group>"; };
+               0C2DA1291F3BEB4900DBC317 /* IOSurfaceSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOSurfaceSPI.h; path = spi/cocoa/IOSurfaceSPI.h; sourceTree = "<group>"; };
+               0C2DA12A1F3BEB4900DBC317 /* IOTypesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOTypesSPI.h; path = spi/cocoa/IOTypesSPI.h; sourceTree = "<group>"; };
+               0C2DA12B1F3BEB4900DBC317 /* LinkPresentationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LinkPresentationSPI.h; path = spi/cocoa/LinkPresentationSPI.h; sourceTree = "<group>"; };
+               0C2DA12C1F3BEB4900DBC317 /* MachVMSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MachVMSPI.h; path = spi/cocoa/MachVMSPI.h; sourceTree = "<group>"; };
+               0C2DA12D1F3BEB4900DBC317 /* NEFilterSourceSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NEFilterSourceSPI.h; path = spi/cocoa/NEFilterSourceSPI.h; sourceTree = "<group>"; };
+               0C2DA12E1F3BEB4900DBC317 /* NSAttributedStringSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSAttributedStringSPI.h; path = spi/cocoa/NSAttributedStringSPI.h; sourceTree = "<group>"; };
+               0C2DA12F1F3BEB4900DBC317 /* NSButtonCellSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSButtonCellSPI.h; path = spi/cocoa/NSButtonCellSPI.h; sourceTree = "<group>"; };
+               0C2DA1301F3BEB4900DBC317 /* NSCalendarDateSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSCalendarDateSPI.h; path = spi/cocoa/NSCalendarDateSPI.h; sourceTree = "<group>"; };
+               0C2DA1311F3BEB4900DBC317 /* NSColorSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSColorSPI.h; path = spi/cocoa/NSColorSPI.h; sourceTree = "<group>"; };
+               0C2DA1321F3BEB4900DBC317 /* NSExtensionSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSExtensionSPI.h; path = spi/cocoa/NSExtensionSPI.h; sourceTree = "<group>"; };
+               0C2DA1331F3BEB4900DBC317 /* NSFileManagerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSFileManagerSPI.h; path = spi/cocoa/NSFileManagerSPI.h; sourceTree = "<group>"; };
+               0C2DA1341F3BEB4900DBC317 /* NSStringSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSStringSPI.h; path = spi/cocoa/NSStringSPI.h; sourceTree = "<group>"; };
+               0C2DA1351F3BEB4900DBC317 /* NSTouchBarSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSTouchBarSPI.h; path = spi/cocoa/NSTouchBarSPI.h; sourceTree = "<group>"; };
+               0C2DA1361F3BEB4900DBC317 /* NSURLConnectionSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSURLConnectionSPI.h; path = spi/cocoa/NSURLConnectionSPI.h; sourceTree = "<group>"; };
+               0C2DA1371F3BEB4900DBC317 /* NSURLDownloadSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSURLDownloadSPI.h; path = spi/cocoa/NSURLDownloadSPI.h; sourceTree = "<group>"; };
+               0C2DA1381F3BEB4900DBC317 /* NSURLFileTypeMappingsSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSURLFileTypeMappingsSPI.h; path = spi/cocoa/NSURLFileTypeMappingsSPI.h; sourceTree = "<group>"; };
+               0C2DA1391F3BEB4900DBC317 /* PassKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PassKitSPI.h; path = spi/cocoa/PassKitSPI.h; sourceTree = "<group>"; };
+               0C2DA13A1F3BEB4900DBC317 /* pthreadSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pthreadSPI.h; path = spi/cocoa/pthreadSPI.h; sourceTree = "<group>"; };
+               0C2DA13B1F3BEB4900DBC317 /* QuartzCoreSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuartzCoreSPI.h; path = spi/cocoa/QuartzCoreSPI.h; sourceTree = "<group>"; };
+               0C2DA13C1F3BEB4900DBC317 /* ServersSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ServersSPI.h; path = spi/cocoa/ServersSPI.h; sourceTree = "<group>"; };
+               0C2DA13D1F3BEB4900DBC317 /* WebFilterEvaluatorSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebFilterEvaluatorSPI.h; path = spi/cocoa/WebFilterEvaluatorSPI.h; sourceTree = "<group>"; };
                1C09D03D1E31C32800725F18 /* libPAL.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPAL.a; sourceTree = BUILT_PRODUCTS_DIR; };
                1C09D0521E31C44100725F18 /* CryptoDigest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoDigest.h; sourceTree = "<group>"; };
                1C09D0551E31C46500725F18 /* CryptoDigestCommonCrypto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CryptoDigestCommonCrypto.cpp; path = commoncrypto/CryptoDigestCommonCrypto.cpp; sourceTree = "<group>"; };
@@ -90,6 +150,8 @@
                        isa = PBXGroup;
                        children = (
                                0C2DA0661F33CA3A00DBC317 /* cf */,
+                               0C2DA11B1F3BE9D200DBC317 /* cg */,
+                               0C2DA1201F3BE9E700DBC317 /* cocoa */,
                        );
                        name = spi;
                        sourceTree = "<group>";
@@ -107,6 +169,50 @@
                        name = cf;
                        sourceTree = "<group>";
                };
+               0C2DA11B1F3BE9D200DBC317 /* cg */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0C2DA11C1F3BE9E000DBC317 /* CoreGraphicsSPI.h */,
+                               0C2DA11D1F3BE9E000DBC317 /* ImageIOSPI.h */,
+                       );
+                       name = cg;
+                       sourceTree = "<group>";
+               };
+               0C2DA1201F3BE9E700DBC317 /* cocoa */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0C2DA1221F3BEB4900DBC317 /* AVKitSPI.h */,
+                               0C2DA1231F3BEB4900DBC317 /* CFNSURLConnectionSPI.h */,
+                               0C2DA1241F3BEB4900DBC317 /* CoreTextSPI.h */,
+                               0C2DA1251F3BEB4900DBC317 /* DataDetectorsCoreSPI.h */,
+                               0C2DA1261F3BEB4900DBC317 /* IOPMLibSPI.h */,
+                               0C2DA1271F3BEB4900DBC317 /* IOPSLibSPI.h */,
+                               0C2DA1281F3BEB4900DBC317 /* IOReturnSPI.h */,
+                               0C2DA1291F3BEB4900DBC317 /* IOSurfaceSPI.h */,
+                               0C2DA12A1F3BEB4900DBC317 /* IOTypesSPI.h */,
+                               0C2DA12B1F3BEB4900DBC317 /* LinkPresentationSPI.h */,
+                               0C2DA12C1F3BEB4900DBC317 /* MachVMSPI.h */,
+                               0C2DA12D1F3BEB4900DBC317 /* NEFilterSourceSPI.h */,
+                               0C2DA12E1F3BEB4900DBC317 /* NSAttributedStringSPI.h */,
+                               0C2DA12F1F3BEB4900DBC317 /* NSButtonCellSPI.h */,
+                               0C2DA1301F3BEB4900DBC317 /* NSCalendarDateSPI.h */,
+                               0C2DA1311F3BEB4900DBC317 /* NSColorSPI.h */,
+                               0C2DA1321F3BEB4900DBC317 /* NSExtensionSPI.h */,
+                               0C2DA1331F3BEB4900DBC317 /* NSFileManagerSPI.h */,
+                               0C2DA1341F3BEB4900DBC317 /* NSStringSPI.h */,
+                               0C2DA1351F3BEB4900DBC317 /* NSTouchBarSPI.h */,
+                               0C2DA1361F3BEB4900DBC317 /* NSURLConnectionSPI.h */,
+                               0C2DA1371F3BEB4900DBC317 /* NSURLDownloadSPI.h */,
+                               0C2DA1381F3BEB4900DBC317 /* NSURLFileTypeMappingsSPI.h */,
+                               0C2DA1391F3BEB4900DBC317 /* PassKitSPI.h */,
+                               0C2DA13A1F3BEB4900DBC317 /* pthreadSPI.h */,
+                               0C2DA13B1F3BEB4900DBC317 /* QuartzCoreSPI.h */,
+                               0C2DA13C1F3BEB4900DBC317 /* ServersSPI.h */,
+                               0C2DA13D1F3BEB4900DBC317 /* WebFilterEvaluatorSPI.h */,
+                       );
+                       name = cocoa;
+                       sourceTree = "<group>";
+               };
                1C09D0341E31C32800725F18 = {
                        isa = PBXGroup;
                        children = (
@@ -210,17 +316,47 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               0C2DA13E1F3BEB4900DBC317 /* AVKitSPI.h in Headers */,
                                0C2DA06D1F33CA8400DBC317 /* CFLocaleSPI.h in Headers */,
                                0C2DA06E1F33CA8400DBC317 /* CFNetworkConnectionCacheSPI.h in Headers */,
                                0C2DA06F1F33CA8400DBC317 /* CFNetworkSPI.h in Headers */,
+                               0C2DA13F1F3BEB4900DBC317 /* CFNSURLConnectionSPI.h in Headers */,
                                0C2DA0701F33CA8400DBC317 /* CFUtilitiesSPI.h in Headers */,
                                1C09D0581E31C57E00725F18 /* config.h in Headers */,
                                0C2DA0711F33CA8400DBC317 /* CoreAudioSPI.h in Headers */,
+                               0C2DA11E1F3BE9E000DBC317 /* CoreGraphicsSPI.h in Headers */,
                                0C2DA0721F33CA8400DBC317 /* CoreMediaSPI.h in Headers */,
+                               0C2DA1401F3BEB4900DBC317 /* CoreTextSPI.h in Headers */,
                                1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */,
+                               0C2DA1411F3BEB4900DBC317 /* DataDetectorsCoreSPI.h in Headers */,
                                0C2D9E731EEF5AF600DBC317 /* ExportMacros.h in Headers */,
+                               0C2DA11F1F3BE9E000DBC317 /* ImageIOSPI.h in Headers */,
+                               0C2DA1421F3BEB4900DBC317 /* IOPMLibSPI.h in Headers */,
+                               0C2DA1431F3BEB4900DBC317 /* IOPSLibSPI.h in Headers */,
+                               0C2DA1441F3BEB4900DBC317 /* IOReturnSPI.h in Headers */,
+                               0C2DA1451F3BEB4900DBC317 /* IOSurfaceSPI.h in Headers */,
+                               0C2DA1461F3BEB4900DBC317 /* IOTypesSPI.h in Headers */,
                                A30D41211F0DD0EA00B71954 /* KillRing.h in Headers */,
+                               0C2DA1471F3BEB4900DBC317 /* LinkPresentationSPI.h in Headers */,
+                               0C2DA1481F3BEB4900DBC317 /* MachVMSPI.h in Headers */,
+                               0C2DA1491F3BEB4900DBC317 /* NEFilterSourceSPI.h in Headers */,
+                               0C2DA14A1F3BEB4900DBC317 /* NSAttributedStringSPI.h in Headers */,
+                               0C2DA14B1F3BEB4900DBC317 /* NSButtonCellSPI.h in Headers */,
+                               0C2DA14C1F3BEB4900DBC317 /* NSCalendarDateSPI.h in Headers */,
+                               0C2DA14D1F3BEB4900DBC317 /* NSColorSPI.h in Headers */,
+                               0C2DA14E1F3BEB4900DBC317 /* NSExtensionSPI.h in Headers */,
+                               0C2DA14F1F3BEB4900DBC317 /* NSFileManagerSPI.h in Headers */,
+                               0C2DA1501F3BEB4900DBC317 /* NSStringSPI.h in Headers */,
+                               0C2DA1511F3BEB4900DBC317 /* NSTouchBarSPI.h in Headers */,
+                               0C2DA1521F3BEB4900DBC317 /* NSURLConnectionSPI.h in Headers */,
+                               0C2DA1531F3BEB4900DBC317 /* NSURLDownloadSPI.h in Headers */,
+                               0C2DA1541F3BEB4900DBC317 /* NSURLFileTypeMappingsSPI.h in Headers */,
+                               0C2DA1551F3BEB4900DBC317 /* PassKitSPI.h in Headers */,
+                               0C2DA1561F3BEB4900DBC317 /* pthreadSPI.h in Headers */,
+                               0C2DA1571F3BEB4900DBC317 /* QuartzCoreSPI.h in Headers */,
+                               0C2DA1581F3BEB4900DBC317 /* ServersSPI.h in Headers */,
                                A3788E981F05B6CE00679425 /* Sound.h in Headers */,
+                               0C2DA1591F3BEB4900DBC317 /* WebFilterEvaluatorSPI.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/Source/WebCore/PAL/pal/PlatformAppleWin.cmake b/Source/WebCore/PAL/pal/PlatformAppleWin.cmake
index 1f5f93213c7fe2743545896bf200aed594246dcb..595b33cbc9f9b489eb23106e585ef08e43b733eb 100644 (file)
--- a/Source/WebCore/PAL/pal/PlatformAppleWin.cmake
+++ b/Source/WebCore/PAL/pal/PlatformAppleWin.cmake
@@ -1,8 +1,10 @@
 list(APPEND PAL_FORWARDING_HEADERS_DIRECTORIES
+    spi/cf
 )
 
 if (${USE_DIRECT2D})
 else ()
     list(APPEND PAL_FORWARDING_HEADERS_DIRECTORIES
+        spi/cg
     )
 endif ()

diff --git a/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h b/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h
similarity index 96%
rename from Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h
rename to Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h
index 0fc71c443fcc38e5a210ac22427f7d46029588a3..f3cbec41c89615f84de365700fcf743a0f77f6fe 100644 (file)
--- a/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h
+++ b/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h
@@ -23,14 +23,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef CoreGraphicsSPI_h
-#define CoreGraphicsSPI_h
+#pragma once
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreGraphics/CoreGraphics.h>
 
 #if USE(IOSURFACE)
-#include "IOSurfaceSPI.h"
+#include <pal/spi/cocoa/IOSurfaceSPI.h>
 #endif
 
 #if PLATFORM(MAC)
@@ -216,7 +215,7 @@ void CGFontCacheSetMaxSize(CGFontCache*, size_t);
 
 #if PLATFORM(MAC)
 CGSConnectionID CGSMainConnectionID(void);
-CFArrayRef CGSHWCaptureWindowList(CGSConnectionID cid, CGSWindowIDList windowList, CGSWindowCount windowCount, CGSWindowCaptureOptions options);
+CFArrayRef CGSHWCaptureWindowList(CGSConnectionID, CGSWindowIDList windowList, CGSWindowCount, CGSWindowCaptureOptions);
 CGError CGSSetConnectionProperty(CGSConnectionID, CGSConnectionID ownerCid, CFStringRef key, CFTypeRef value);
 CGError CGSCopyConnectionProperty(CGSConnectionID, CGSConnectionID ownerCid, CFStringRef key, CFTypeRef *value);
 CGError CGSGetScreenRectForWindow(CGSConnectionID, CGSWindowID, CGRect *);
@@ -225,5 +224,3 @@ bool ColorSyncProfileIsWideGamut(ColorSyncProfileRef);
 #endif
 
 WTF_EXTERN_C_END
-
-#endif // CoreGraphicsSPI_h

diff --git a/Source/WebCore/platform/spi/cg/ImageIOSPI.h b/Source/WebCore/PAL/pal/spi/cg/ImageIOSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cg/ImageIOSPI.h
rename to Source/WebCore/PAL/pal/spi/cg/ImageIOSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/AVKitSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h
similarity index 95%
rename from Source/WebCore/platform/spi/cocoa/AVKitSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h
index 1b98756336f2a31fa902bb3755299bf953440434..437c57668bd2f64f0dbf60dcc1123f4f8259cbf2 100644 (file)
--- a/Source/WebCore/platform/spi/cocoa/AVKitSPI.h
+++ b/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h
@@ -183,7 +183,7 @@ typedef AVFunctionBarMediaSelectionOption AVTouchBarMediaSelectionOption;
 
 NS_ASSUME_NONNULL_BEGIN
 
-__attribute__((availability(macosx,obsoleted=10.13))) @protocol AVFunctionBarPlaybackControlsControlling <NSObject>;
+__attribute__((availability(macosx, obsoleted = 10.13))) @protocol AVFunctionBarPlaybackControlsControlling <NSObject>;
 @property (readonly) NSTimeInterval contentDuration;
 @property (readonly, nullable) AVValueTiming *timing;
 @property (readonly, getter=isSeeking) BOOL seeking;
@@ -193,14 +193,14 @@ __attribute__((availability(macosx,obsoleted=10.13))) @protocol AVFunctionBarPla
 @property (readonly) BOOL hasEnabledVideo;
 @end
 
-__attribute__((availability(macosx,obsoleted=10.13))) @interface AVFunctionBarPlaybackControlsProvider : NSResponder
+__attribute__((availability(macosx, obsoleted = 10.13))) @interface AVFunctionBarPlaybackControlsProvider : NSResponder
 @property (strong, readonly, nullable) NSTouchBar *touchBar;
 @property (assign, nullable) id<AVFunctionBarPlaybackControlsControlling> playbackControlsController;
 @end
 
 @class AVThumbnail;
 
-__attribute__((availability(macosx,obsoleted=10.13))) @interface AVFunctionBarScrubber : NSView
+__attribute__((availability(macosx, obsoleted = 10.13))) @interface AVFunctionBarScrubber : NSView
 @property (assign, nullable) id<AVFunctionBarPlaybackControlsControlling> playbackControlsController;
 @end
 
@@ -209,7 +209,7 @@ __attribute__((availability(macosx,obsoleted=10.13))) @interface AVFunctionBarSc
 @protocol AVTouchBarPlaybackControlsControlling <NSObject>
 @property (readonly) NSTimeInterval contentDuration;
 @property (readonly, nullable) AVValueTiming *timing;
-@property (readonly, getter = isSeeking) BOOL seeking;
+@property (readonly, getter=isSeeking) BOOL seeking;
 @property (readonly) NSTimeInterval seekToTime;
 - (void)seekToTime:(NSTimeInterval)time toleranceBefore:(NSTimeInterval)toleranceBefore toleranceAfter:(NSTimeInterval)toleranceAfter;
 @property (readonly) BOOL hasEnabledAudio;

diff --git a/Source/WebCore/platform/spi/cocoa/CFNSURLConnectionSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/CFNSURLConnectionSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/CFNSURLConnectionSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/CFNSURLConnectionSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h
similarity index 89%
rename from Source/WebCore/platform/spi/cocoa/CoreTextSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h
index d44c628d89133c6b496914789e7995cc9281702e..fd26af9131b831d73c26d86ede3cc1e22415c855 100644 (file)
--- a/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h
+++ b/Source/WebCore/PAL/pal/spi/cocoa/CoreTextSPI.h
@@ -23,11 +23,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef CoreTextSPI_h
-#define CoreTextSPI_h
+#pragma once
 
-#include "CoreGraphicsSPI.h"
 #include <CoreText/CoreText.h>
+#include <pal/spi/cg/CoreGraphicsSPI.h>
 
 #if USE(APPLE_INTERNAL_SDK)
 
@@ -42,14 +41,12 @@ enum {
     kCTFontUIFontSystemUltraLight = 104,
 };
 
-typedef CF_OPTIONS(uint32_t, CTFontTransformOptions)
-{
+typedef CF_OPTIONS(uint32_t, CTFontTransformOptions) {
     kCTFontTransformApplyShaping = (1 << 0),
     kCTFontTransformApplyPositioning = (1 << 1)
 };
 
-typedef CF_OPTIONS(uint32_t, CTFontDescriptorOptions)
-{
+typedef CF_OPTIONS(uint32_t, CTFontDescriptorOptions) {
     kCTFontDescriptorOptionSystemUIFont = 1 << 1,
     kCTFontDescriptorOptionPreferAppleSystemFont = kCTFontOptionsPreferSystemFont
 };
@@ -71,10 +68,10 @@ extern const CFStringRef kCTFontPostScriptNameAttribute;
 
 bool CTFontTransformGlyphs(CTFontRef, CGGlyph glyphs[], CGSize advances[], CFIndex count, CTFontTransformOptions);
 
-CGSize CTRunGetInitialAdvance(CTRunRef run);
-CTLineRef CTLineCreateWithUniCharProvider(CTUniCharProviderCallback provide, CTUniCharDisposeCallback dispose, void* refCon);
+CGSize CTRunGetInitialAdvance(CTRunRef);
+CTLineRef CTLineCreateWithUniCharProvider(CTUniCharProviderCallback, CTUniCharDisposeCallback, void* refCon);
 void CTRunGetBaseAdvancesAndOrigins(CTRunRef, CFRange, CGSize baseAdvances[], CGPoint origins[]);
-CTTypesetterRef CTTypesetterCreateWithUniCharProviderAndOptions(CTUniCharProviderCallback provide, CTUniCharDisposeCallback dispose, void* refCon, CFDictionaryRef options);
+CTTypesetterRef CTTypesetterCreateWithUniCharProviderAndOptions(CTUniCharProviderCallback, CTUniCharDisposeCallback, void* refCon, CFDictionaryRef options);
 bool CTFontGetVerticalGlyphsForCharacters(CTFontRef, const UniChar characters[], CGGlyph glyphs[], CFIndex count);
 void CTFontGetUnsummedAdvancesForGlyphsAndStyle(CTFontRef, CTFontOrientation, CGFontRenderingStyle, const CGGlyph[], CGSize advances[], CFIndex count);
 
@@ -130,10 +127,8 @@ extern const CFStringRef kCTUIFontTextStyleTitle3;
 extern const CFStringRef kCTUIFontTextStyleTitle4;
 CTFontDescriptorRef CTFontCreatePhysicalFontDescriptorForCharactersWithLanguage(CTFontRef currentFont, const UTF16Char* characters, CFIndex length, CFStringRef language, CFIndex* coveredLength);
 
-__attribute__((availability(macosx,obsoleted=10.13))) __attribute__((availability(ios,obsoleted=11.0))) CTFontRef CTFontCreatePhysicalFontForCharactersWithLanguage(CTFontRef, const UTF16Char* characters, CFIndex length, CFStringRef language, CFIndex* coveredLength);
+__attribute__((availability(macosx, obsoleted = 10.13))) __attribute__((availability(ios, obsoleted = 11.0))) CTFontRef CTFontCreatePhysicalFontForCharactersWithLanguage(CTFontRef, const UTF16Char* characters, CFIndex length, CFStringRef language, CFIndex* coveredLength);
 bool CTFontIsAppleColorEmoji(CTFontRef);
 CTFontRef CTFontCreateForCharacters(CTFontRef currentFont, const UTF16Char *characters, CFIndex length, CFIndex *coveredLength);
 
 WTF_EXTERN_C_END
-
-#endif

diff --git a/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/DataDetectorsCoreSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/DataDetectorsCoreSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/IOPMLibSPI.h
similarity index 88%
rename from Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/IOPMLibSPI.h
index 5f70b2371207ae63a96e00f8b517dba198897713..15894ca49570e0ef6152358139ba7f4ceca3cb95 100644 (file)
--- a/Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h
+++ b/Source/WebCore/PAL/pal/spi/cocoa/IOPMLibSPI.h
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef IOPMLibSPI_h
-#define IOPMLibSPI_h
+#pragma once
 
 #include <CoreFoundation/CoreFoundation.h>
 
@@ -34,7 +33,7 @@
 
 #else
 
-#include "IOReturnSPI.h"
+#include <pal/spi/cocoa/IOReturnSPI.h>
 
 typedef uint32_t IOPMAssertionID;
 
@@ -50,9 +49,7 @@ WTF_EXTERN_C_END
 WTF_EXTERN_C_BEGIN
 
 IOReturn IOPMAssertionCreateWithDescription(CFStringRef assertionType, CFStringRef name, CFStringRef details, CFStringRef humanReadableReason,
-                                                     CFStringRef localizationBundlePath, CFTimeInterval timeout, CFStringRef timeoutAction, IOPMAssertionID *);
+    CFStringRef localizationBundlePath, CFTimeInterval timeout, CFStringRef timeoutAction, IOPMAssertionID *);
 IOReturn IOPMAssertionRelease(IOPMAssertionID);
 
 WTF_EXTERN_C_END
-
-#endif // IOPMLibSPI_h

diff --git a/Source/WebCore/platform/spi/cocoa/IOPSLibSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/IOPSLibSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/IOPSLibSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/IOPSLibSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/IOReturnSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/IOReturnSPI.h
similarity index 95%
rename from Source/WebCore/platform/spi/cocoa/IOReturnSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/IOReturnSPI.h
index fc3e2fd881234845bb1f6f3e2bca05231fc5de05..944bc9d3606876e00f5da31eddf023b9594ce037 100644 (file)
--- a/Source/WebCore/platform/spi/cocoa/IOReturnSPI.h
+++ b/Source/WebCore/PAL/pal/spi/cocoa/IOReturnSPI.h
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef IOReturnSPI_h
-#define IOReturnSPI_h
+#pragma once
 
 #if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
 
@@ -39,5 +38,3 @@ typedef kern_return_t IOReturn;
 #define kIOReturnSuccess KERN_SUCCESS
 
 #endif
-
-#endif // IOReturnSPI_h

diff --git a/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h
similarity index 90%
rename from Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h
index c8a969bfd0fff1535e3ef3f03d6213cbd64a223a..16b9c4e1487218fc8e9589ed2047a2279314cedb 100644 (file)
--- a/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h
+++ b/Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef IOSurfaceSPI_h
-#define IOSurfaceSPI_h
+#pragma once
 
 #if !PLATFORM(IOS_SIMULATOR)
 
@@ -34,10 +33,10 @@
 
 #else
 
-#include "IOReturnSPI.h"
-#include "IOTypesSPI.h"
 #include <CoreFoundation/CFBase.h>
 #include <mach/mach_port.h>
+#include <pal/spi/cocoa/IOReturnSPI.h>
+#include <pal/spi/cocoa/IOTypesSPI.h>
 
 typedef struct __IOSurface *IOSurfaceRef;
 
@@ -126,8 +125,8 @@ typedef struct __IOSurfaceAccelerator *IOSurfaceAcceleratorRef;
 
 WTF_EXTERN_C_BEGIN
 
-IOReturn IOSurfaceAcceleratorCreate(CFAllocatorRef allocator, CFDictionaryRef properties, IOSurfaceAcceleratorRef* acceleratorOut);
-CFRunLoopSourceRef IOSurfaceAcceleratorGetRunLoopSource(IOSurfaceAcceleratorRef accelerator);
+IOReturn IOSurfaceAcceleratorCreate(CFAllocatorRef, CFDictionaryRef properties, IOSurfaceAcceleratorRef* acceleratorOut);
+CFRunLoopSourceRef IOSurfaceAcceleratorGetRunLoopSource(IOSurfaceAcceleratorRef);
 
 typedef void (*IOSurfaceAcceleratorCompletionCallback)(void* completionRefCon, IOReturn status, void* completionRefCon2);
 
@@ -137,7 +136,7 @@ typedef struct IOSurfaceAcceleratorCompletion {
     void* completionRefCon2;
 } IOSurfaceAcceleratorCompletion;
 
-IOReturn IOSurfaceAcceleratorTransformSurface(IOSurfaceAcceleratorRef accelerator, IOSurfaceRef sourceBuffer, IOSurfaceRef destinationBuffer, CFDictionaryRef options, void* pCropRectangles, IOSurfaceAcceleratorCompletion* pCompletion, void* pSwap, uint32_t* pCommandID);
+IOReturn IOSurfaceAcceleratorTransformSurface(IOSurfaceAcceleratorRef, IOSurfaceRef sourceBuffer, IOSurfaceRef destinationBuffer, CFDictionaryRef options, void* pCropRectangles, IOSurfaceAcceleratorCompletion* pCompletion, void* pSwap, uint32_t* pCommandID);
 
 WTF_EXTERN_C_END
 
@@ -145,5 +144,3 @@ WTF_EXTERN_C_END
 #endif // PLATFORM(IOS)
 
 #endif // !PLATFORM(IOS_SIMULATOR)
-
-#endif // IOSurfaceSPI_h

diff --git a/Source/WebCore/platform/spi/cocoa/IOTypesSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/IOTypesSPI.h
similarity index 96%
rename from Source/WebCore/platform/spi/cocoa/IOTypesSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/IOTypesSPI.h
index f399dc3358d4fd6787bee621518e7b2a06bc1b31..c27d8dedee3a0f0f506b6e0ab4dcb5266b105771 100644 (file)
--- a/Source/WebCore/platform/spi/cocoa/IOTypesSPI.h
+++ b/Source/WebCore/PAL/pal/spi/cocoa/IOTypesSPI.h
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef IOTypesSPI_h
-#define IOTypesSPI_h
+#pragma once
 
 #if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
 
@@ -42,5 +41,3 @@ enum {
 };
 
 #endif
-
-#endif // IOTypesSPI_h

diff --git a/Source/WebCore/platform/spi/cocoa/LinkPresentationSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/LinkPresentationSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/LinkPresentationSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/LinkPresentationSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/MachVMSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/MachVMSPI.h
similarity index 87%
rename from Source/WebCore/platform/spi/cocoa/MachVMSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/MachVMSPI.h
index 5a1faa26aeb2322d4bca9f07aa06cf284100a618..83d0c505196f4fcec4197717087124afe05d7b28 100644 (file)
--- a/Source/WebCore/platform/spi/cocoa/MachVMSPI.h
+++ b/Source/WebCore/PAL/pal/spi/cocoa/MachVMSPI.h
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MachVMSPI_h
-#define MachVMSPI_h
+#pragma once
 
 #include <mach/boolean.h>
 #include <mach/kern_return.h>
@@ -39,13 +38,11 @@ WTF_EXTERN_C_BEGIN
 kern_return_t mach_vm_allocate(vm_map_t target, mach_vm_address_t*, mach_vm_size_t, int flags);
 kern_return_t mach_vm_deallocate(vm_map_t target, mach_vm_address_t, mach_vm_size_t);
 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);
+    mem_entry_name_port_t, memory_object_offset_t, boolean_t copy, vm_prot_t currentProtection, vm_prot_t maximumProtection, vm_inherit_t);
 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);
 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);
+    mach_msg_type_number_t* infoCount, mach_port_t* objectName);
 kern_return_t mach_vm_region_recurse(vm_map_t targetTask, mach_vm_address_t*, mach_vm_size_t*, uint32_t* depth, vm_region_recurse_info_t, mach_msg_type_number_t* infoCount);
 kern_return_t mach_vm_purgable_control(vm_map_t target, mach_vm_address_t, vm_purgable_t control, int* state);
 
 WTF_EXTERN_C_END
-
-#endif // MachVMSPI_h

diff --git a/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NEFilterSourceSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/NEFilterSourceSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/NSAttributedStringSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h
similarity index 98%
rename from Source/WebCore/platform/spi/cocoa/NSAttributedStringSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h
index 22ecc972bd72eb305bf0dd81676815c714a51236..b88cd4a0de7293153e52dbc1b15993f05a933e3a 100644 (file)
--- a/Source/WebCore/platform/spi/cocoa/NSAttributedStringSPI.h
+++ b/Source/WebCore/PAL/pal/spi/cocoa/NSAttributedStringSPI.h
@@ -23,8 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef NSAttributedStringSPI_h
-#define NSAttributedStringSPI_h
+#pragma once
 
 #import <wtf/SoftLinking.h>
 
@@ -120,5 +119,3 @@ static NSString *const NSSuperscriptAttributeName = @"NSSuperscript";
 @end
 
 #endif
-
-#endif

diff --git a/Source/WebCore/platform/spi/cocoa/NSButtonCellSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NSButtonCellSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/NSButtonCellSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/NSButtonCellSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/NSCalendarDateSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NSCalendarDateSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/NSCalendarDateSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/NSCalendarDateSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/NSColorSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NSColorSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/NSColorSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/NSColorSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/NSExtensionSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NSExtensionSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/NSExtensionSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/NSExtensionSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/NSFileManagerSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NSFileManagerSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/NSFileManagerSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/NSFileManagerSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/NSStringSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NSStringSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/NSStringSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/NSStringSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NSTouchBarSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/NSTouchBarSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NSURLConnectionSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/NSURLConnectionSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NSURLDownloadSPI.h
similarity index 99%
rename from Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/NSURLDownloadSPI.h
index ec2c7fbed5d20ddd3cbff8998e183afda002f087..bad82de021430e0804b50e1999d2062a322449eb 100644 (file)
--- a/Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h
+++ b/Source/WebCore/PAL/pal/spi/cocoa/NSURLDownloadSPI.h
@@ -23,6 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#pragma once
+
 #import <Foundation/NSObject.h>
 
 #if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)

diff --git a/Source/WebCore/platform/spi/cocoa/NSURLFileTypeMappingsSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/NSURLFileTypeMappingsSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/NSURLFileTypeMappingsSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/NSURLFileTypeMappingsSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/PassKitSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h
similarity index 99%
rename from Source/WebCore/platform/spi/cocoa/PassKitSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h
index b1330e9fec849ee5187f7e0cbf35cd0ea8cdcfe6..48ba714f3f84b8fe3e3ed893874e98811c92b264 100644 (file)
--- a/Source/WebCore/platform/spi/cocoa/PassKitSPI.h
+++ b/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h
@@ -67,7 +67,7 @@ typedef NS_OPTIONS(NSUInteger, PKAddressField) {
     PKAddressFieldPhone = 1UL << 1,
     PKAddressFieldEmail = 1UL << 2,
     PKAddressFieldName = 1UL << 3,
-    PKAddressFieldAll = (PKAddressFieldPostalAddress|PKAddressFieldPhone|PKAddressFieldEmail|PKAddressFieldName)
+    PKAddressFieldAll = (PKAddressFieldPostalAddress | PKAddressFieldPhone | PKAddressFieldEmail | PKAddressFieldName)
 };
 
 typedef NS_OPTIONS(NSUInteger, PKMerchantCapability) {

diff --git a/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h
similarity index 99%
rename from Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h
index f2329686f0eecb13d627eb1b8c55b2a6807b3589..b01d5e093cc1fbfe8cda28624a2d3c6dfc5c5992 100644 (file)
--- a/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h
+++ b/Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h
@@ -24,7 +24,7 @@
  */
 
 #import <QuartzCore/QuartzCore.h>
-#import <WebCore/IOSurfaceSPI.h>
+#import <pal/spi/cocoa/IOSurfaceSPI.h>
 
 #if USE(APPLE_INTERNAL_SDK)
 

diff --git a/Source/WebCore/platform/spi/cocoa/ServersSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/ServersSPI.h
similarity index 96%
rename from Source/WebCore/platform/spi/cocoa/ServersSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/ServersSPI.h
index 42b0d568b4f6870b50d1fd364c30377101adbe5c..bd4e07d6b894ae24816b721c4ef15bae87f854ae 100644 (file)
--- a/Source/WebCore/platform/spi/cocoa/ServersSPI.h
+++ b/Source/WebCore/PAL/pal/spi/cocoa/ServersSPI.h
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef ServersSPI_h
-#define ServersSPI_h
+#pragma once
 
 #include <mach/message.h>
 
@@ -50,5 +49,3 @@ kern_return_t bootstrap_look_up(mach_port_t, const name_t serviceName, mach_port
 kern_return_t bootstrap_register2(mach_port_t, name_t, mach_port_t, uint64_t flags);
 
 WTF_EXTERN_C_END
-
-#endif // ServersSPI_h

diff --git a/Source/WebCore/platform/spi/cocoa/WebFilterEvaluatorSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/WebFilterEvaluatorSPI.h
similarity index 100%
rename from Source/WebCore/platform/spi/cocoa/WebFilterEvaluatorSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/WebFilterEvaluatorSPI.h

diff --git a/Source/WebCore/platform/spi/cocoa/pthreadSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/pthreadSPI.h
similarity index 95%
rename from Source/WebCore/platform/spi/cocoa/pthreadSPI.h
rename to Source/WebCore/PAL/pal/spi/cocoa/pthreadSPI.h
index 6d6d392b00ab3b20769e2f4ec6f486bfdb4262b0..9358bc5ab53e6e6c74c09660d013c49a8d97cb46 100644 (file)
--- a/Source/WebCore/platform/spi/cocoa/pthreadSPI.h
+++ b/Source/WebCore/PAL/pal/spi/cocoa/pthreadSPI.h
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PthreadSPI_h
-#define PthreadSPI_h
+#pragma once
 
 #include <pthread.h>
 
@@ -33,5 +32,3 @@ WTF_EXTERN_C_BEGIN
 int pthread_set_fixedpriority_self(void);
 
 WTF_EXTERN_C_END
-
-#endif // PthreadSPI_h

diff --git a/Source/WebCore/PlatformAppleWin.cmake b/Source/WebCore/PlatformAppleWin.cmake
index 8b9f7de891994137b5c1712c3b350142079fc959..a1111fff5d13fc571790d035102245409d343feb 100644 (file)
--- a/Source/WebCore/PlatformAppleWin.cmake
+++ b/Source/WebCore/PlatformAppleWin.cmake
@@ -11,8 +11,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/graphics/ca/win"
     "${WEBCORE_DIR}/platform/graphics/cg"
     "${WEBCORE_DIR}/platform/network/cf"
-    "${WEBCORE_DIR}/platform/spi/cf"
-    "${WEBCORE_DIR}/platform/spi/cg"
 )
 
 if (${USE_DIRECT2D})
@@ -26,7 +24,6 @@ else ()
         "${WEBCORE_DIR}/platform/graphics/ca"
         "${WEBCORE_DIR}/platform/graphics/ca/win"
         "${WEBCORE_DIR}/platform/graphics/cg"
-        "${WEBCORE_DIR}/platform/spi/cg"
     )
 endif ()
 
@@ -155,8 +152,6 @@ endif ()
 
 list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
     platform/network/cf
-
-    platform/spi/cf
 )
 
 if (${USE_DIRECT2D})
@@ -171,7 +166,5 @@ else ()
         platform/graphics/ca/win
 
         platform/network/cf
-
-        platform/spi/cg
     )
 endif ()

diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index b8dde40f7ab59fc9782364f0343133dca97b8a59..4b4070a0afb59b1a2da26ad18b6ff791ace7ac49 100644 (file)
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -297,7 +297,6 @@
                07EE76EC1BE96DB000F89133 /* MockRealtimeVideoSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 07EE76EA1BE96DB000F89133 /* MockRealtimeVideoSource.h */; settings = {ATTRIBUTES = (Private, ); }; };
                07EE76EF1BEA619800F89133 /* MockRealtimeVideoSourceMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 07EE76ED1BEA619800F89133 /* MockRealtimeVideoSourceMac.h */; };
                07EE76F01BEA619800F89133 /* MockRealtimeVideoSourceMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 07EE76EE1BEA619800F89133 /* MockRealtimeVideoSourceMac.mm */; };
-               07F0B97A1AC5DB3300E535D9 /* AVKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 07F0B9791AC5DB3300E535D9 /* AVKitSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                07F0B97C1AC5DB4600E535D9 /* AVFoundationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 07F0B97B1AC5DB4600E535D9 /* AVFoundationSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                07F876841AD580F900905849 /* MediaPlaybackTargetContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 07F876831AD4A94500905849 /* MediaPlaybackTargetContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
                07F944161864D046005D31CB /* PlatformMediaSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAE8C081746B95700532D78 /* PlatformMediaSessionManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -961,7 +960,6 @@
                1AE96A921D1A0DDD00B86768 /* JSApplePayShippingMethodSelectedEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE96A821D1A0A8000B86768 /* JSApplePayShippingMethodSelectedEvent.cpp */; };
                1AE96A931D1A0DDD00B86768 /* JSApplePayShippingMethodSelectedEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE96A831D1A0A8000B86768 /* JSApplePayShippingMethodSelectedEvent.h */; };
                1AE96A941D1A0DDD00B86768 /* JSApplePayValidateMerchantEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE96A841D1A0A8000B86768 /* JSApplePayValidateMerchantEvent.cpp */; };
-               1AED3BDA1D3D5F260099FD78 /* PassKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AED3BD91D3D5F260099FD78 /* PassKitSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AEF4E67170E160300AB2799 /* CachedFontClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEF4E66170E160300AB2799 /* CachedFontClient.h */; };
                1AEF4E69170E174800AB2799 /* CachedSVGDocumentClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEF4E68170E174800AB2799 /* CachedSVGDocumentClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AF326790D78B9440068F0C4 /* EditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF326770D78B9440068F0C4 /* EditorClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1014,7 +1012,6 @@
                1C26497A0D7E248A00BD10F2 /* DocumentLoaderMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C2649790D7E248A00BD10F2 /* DocumentLoaderMac.cpp */; };
                1C3249111C6D6A3B007EDB32 /* FontVariantBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C3249101C6D6A3B007EDB32 /* FontVariantBuilder.cpp */; };
                1C3969D01B74211E002BCFA7 /* FontCacheCoreText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C3969CF1B74211E002BCFA7 /* FontCacheCoreText.cpp */; };
-               1C6466251A12C38E0094603C /* CoreTextSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C5E980F1A02CEFA002DB55F /* CoreTextSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1C6466281A12C4200094603C /* NSFontSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C6466271A12C3F90094603C /* NSFontSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1C6626101C6E7CA600AB527C /* FontFace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C66260E1C6E7CA600AB527C /* FontFace.cpp */; };
                1C6626111C6E7CA600AB527C /* FontFace.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C66260F1C6E7CA600AB527C /* FontFace.h */; };
@@ -1198,7 +1195,6 @@
                2D481F02146B5C5500AA7834 /* CrossfadeGeneratedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D2FC0551460CD6F00263633 /* CrossfadeGeneratedImage.h */; };
                2D481F03146B5C6500AA7834 /* GradientImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D2FC0561460CD6F00263633 /* GradientImage.cpp */; };
                2D481F04146B5C6B00AA7834 /* GradientImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D2FC0571460CD6F00263633 /* GradientImage.h */; };
-               2D4AEA031EBC0FE900C4A93A /* LinkPresentationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D4AEA021EBC0FE900C4A93A /* LinkPresentationSPI.h */; };
                2D4F96F51A1ECC240098BF88 /* TextIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */; };
                2D4F96F61A1ECC240098BF88 /* TextIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D4F96F21A1ECC240098BF88 /* TextIndicator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2D4F96F71A1ECC240098BF88 /* TextIndicatorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D4F96F31A1ECC240098BF88 /* TextIndicatorWindow.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1274,7 +1270,6 @@
                2DCB837919F99BBA00A7FBE4 /* NSSharingServicePickerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DCB837719F99BBA00A7FBE4 /* NSSharingServicePickerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2DCB837A19F99BBA00A7FBE4 /* NSSharingServiceSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DCB837819F99BBA00A7FBE4 /* NSSharingServiceSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2DD5A7271EBEE47D009BA597 /* CompositionUnderline.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD5A7261EBEE47D009BA597 /* CompositionUnderline.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               2DDB97F419F9AECA002025D8 /* NSExtensionSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDB97F319F9AECA002025D8 /* NSExtensionSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2DE70023192FE82A00B0975C /* DisplayRefreshMonitorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DE70022192FE82A00B0975C /* DisplayRefreshMonitorMac.h */; };
                2DF512CD1D873E47001D6780 /* ReplaceRangeWithTextCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DF512CB1D873E47001D6780 /* ReplaceRangeWithTextCommand.cpp */; };
                2DF512CE1D873E47001D6780 /* ReplaceRangeWithTextCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF512CC1D873E47001D6780 /* ReplaceRangeWithTextCommand.h */; };
@@ -1540,8 +1535,6 @@
                31A795C71888BCB200382F90 /* ANGLEInstancedArrays.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A795C21888B72400382F90 /* ANGLEInstancedArrays.h */; };
                31A795C81888BCB500382F90 /* ANGLEInstancedArrays.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A795C11888B72400382F90 /* ANGLEInstancedArrays.cpp */; };
                31AB5000122878A2001A7DB0 /* GraphicsContext3DIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 31AB4FFF122878A2001A7DB0 /* GraphicsContext3DIOS.h */; };
-               31B313DB1B69871600F2AABC /* NSURLConnectionSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 31B313DA1B69871600F2AABC /* NSURLConnectionSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               31B313DF1B6988C500F2AABC /* NSButtonCellSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 31B313DE1B6988C500F2AABC /* NSButtonCellSPI.h */; };
                31BC742D1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31BC742B1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.cpp */; };
                31BC742E1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 31BC742C1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.h */; };
                31C0FF210E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31C0FF1B0E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp */; };
@@ -1559,7 +1552,6 @@
                31DCDF441DA1C45400EA5B93 /* ExtendedColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 31DCDF421DA1C45400EA5B93 /* ExtendedColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
                31DEA4551B39F4D900F77178 /* WebSystemBackdropLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31DEA4531B39F4D900F77178 /* WebSystemBackdropLayer.mm */; };
                31DEA4561B39F4D900F77178 /* WebSystemBackdropLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 31DEA4541B39F4D900F77178 /* WebSystemBackdropLayer.h */; };
-               31DF63571AF187DD0078FD91 /* NSColorSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 31DF63561AF187DD0078FD91 /* NSColorSPI.h */; };
                31EAF97E121435A400E7C1BF /* DeviceMotionClientIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 31EAF97C121435A400E7C1BF /* DeviceMotionClientIOS.h */; };
                31EAF97F121435A400E7C1BF /* DeviceMotionClientIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31EAF97D121435A400E7C1BF /* DeviceMotionClientIOS.mm */; };
                31EB54DF1E7DC74400C1623B /* RTCRtpTransceiverDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 31EB54DD1E7DC74400C1623B /* RTCRtpTransceiverDirection.h */; };
@@ -1922,9 +1914,6 @@
                44C991A00F3D210E00586670 /* ThemeIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 44C9919E0F3D210E00586670 /* ThemeIOS.mm */; };
                44DAB5B115A623580097C1E4 /* Extensions3DOpenGLCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44DAB5AF15A623580097C1E4 /* Extensions3DOpenGLCommon.cpp */; };
                44DAB5B215A623580097C1E4 /* Extensions3DOpenGLCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 44DAB5B015A623580097C1E4 /* Extensions3DOpenGLCommon.h */; };
-               44DEF6431A6FF92700D45EEC /* IOReturnSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 44DEF6421A6FF92700D45EEC /* IOReturnSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               44DFF6431A6FF92700D45EEC /* IOSurfaceSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 44DFF6421A6FF92700D45EEC /* IOSurfaceSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               44EFF6431A6FF92700D45EEC /* IOTypesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 44EFF6421A6FF92700D45EEC /* IOTypesSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                450CEBF015073BBE002BB149 /* LabelableElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 450CEBEE15073BBE002BB149 /* LabelableElement.cpp */; };
                450CEBF115073BBE002BB149 /* LabelableElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 450CEBEF15073BBE002BB149 /* LabelableElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4512502215DCE37D002F84E2 /* SpinButtonElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4512502015DCE37D002F84E2 /* SpinButtonElement.cpp */; };
@@ -2531,7 +2520,6 @@
                55A336F91D821E3C0022C4C7 /* ImageBackingStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 55A336F81D821E3C0022C4C7 /* ImageBackingStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
                55AF14E51EAAC59B0026EEAA /* UTIRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55AF14E31EAAC59B0026EEAA /* UTIRegistry.cpp */; };
                55AF14E61EAAC59B0026EEAA /* UTIRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 55AF14E41EAAC59B0026EEAA /* UTIRegistry.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               55B2BDD71EA923A400BFFCBD /* ImageIOSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 55B2BDD61EA923A400BFFCBD /* ImageIOSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                570440531E5278B200356601 /* CryptoAlgorithmAES_CFB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5712526A1E52527C008FF369 /* CryptoAlgorithmAES_CFB.cpp */; };
                570440581E53851600356601 /* CryptoAlgorithmAES_CFBMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 570440571E53851600356601 /* CryptoAlgorithmAES_CFBMac.cpp */; };
                5704405A1E53936200356601 /* JSAesCbcCfbParams.h in Headers */ = {isa = PBXBuildFile; fileRef = 570440591E53936200356601 /* JSAesCbcCfbParams.h */; };
@@ -2838,7 +2826,6 @@
                656D37430ADBA5DE00A4554D /* NetscapePlugInStreamLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D372B0ADBA5DE00A4554D /* NetscapePlugInStreamLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
                656D37480ADBA5DE00A4554D /* SubresourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D37300ADBA5DE00A4554D /* SubresourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
                658436860AE01B7400E53753 /* FrameLoadRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 658436850AE01B7400E53753 /* FrameLoadRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               658F540319A1C9240088FC92 /* NSURLFileTypeMappingsSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 653EF83819A043AE0052202C /* NSURLFileTypeMappingsSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                6593923709AE4346002C531F /* URL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6593923509AE4346002C531F /* URL.cpp */; };
                6593923809AE4346002C531F /* URL.h in Headers */ = {isa = PBXBuildFile; fileRef = 6593923609AE4346002C531F /* URL.h */; settings = {ATTRIBUTES = (Private, ); }; };
                6593923A09AE435C002C531F /* URLMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6593923909AE435C002C531F /* URLMac.mm */; };
@@ -3759,7 +3746,6 @@
                93309EA3099EB78C0056E581 /* SharedTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309EA0099EB78C0056E581 /* SharedTimer.h */; };
                93309EA4099EB78C0056E581 /* Timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309EA1099EB78C0056E581 /* Timer.cpp */; };
                93354A3C0B24F8C9003F6DEA /* UIEventWithKeyState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93354A3B0B24F8C9003F6DEA /* UIEventWithKeyState.cpp */; };
-               9335B49D1DCBEF7C00ED468E /* NSTouchBarSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 9335B49B1DCBEF7100ED468E /* NSTouchBarSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                933A142E0B7D188600A53FFD /* TextEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 933A142B0B7D188600A53FFD /* TextEvent.cpp */; };
                933A14300B7D188600A53FFD /* TextEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 933A142D0B7D188600A53FFD /* TextEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
                933A14B80B7D1D5200A53FFD /* JSTextEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 933A14B60B7D1D5200A53FFD /* JSTextEvent.cpp */; };
@@ -3787,7 +3773,6 @@
                935C476B09AC4D4F00A6AAB4 /* PlatformWheelEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
                935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935C476E09AC4D7300A6AAB4 /* KeyEventMac.mm */; };
                935C477509AC4D8E00A6AAB4 /* GapRects.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C477409AC4D8D00A6AAB4 /* GapRects.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               935E2B4E1AFF06CA00976F9F /* DataDetectorsCoreSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 935E2B4D1AFF06CA00976F9F /* DataDetectorsCoreSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                935F45420F7C3B5F00D7C1FB /* JSLazyEventListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 935F45400F7C3B5F00D7C1FB /* JSLazyEventListener.cpp */; };
                935F45430F7C3B5F00D7C1FB /* JSLazyEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 935F45410F7C3B5F00D7C1FB /* JSLazyEventListener.h */; };
                935FBC4509BA00B900E230B1 /* EventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 935FBC4409BA00B900E230B1 /* EventListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -4226,7 +4211,6 @@
                9BAB6C6C12550631001626D4 /* EditingStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BAB6C6A12550631001626D4 /* EditingStyle.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9BAB6C6D12550631001626D4 /* EditingStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BAB6C6B12550631001626D4 /* EditingStyle.cpp */; };
                9BAF3B2412C1A39800014BF1 /* WritingDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BAF3B2312C1A39800014BF1 /* WritingDirection.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               9BB737651B41C03500AE13EB /* NSAttributedStringSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BB737641B41C03500AE13EB /* NSAttributedStringSPI.h */; };
                9BC5F9E01D5AAF6B002B749D /* JSCustomElementRegistryCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BC5F9DF1D5AAF6A002B749D /* JSCustomElementRegistryCustom.cpp */; };
                9BC6C21B13CCC97B008E0337 /* HTMLTextFormControlElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BC6C21913CCC97B008E0337 /* HTMLTextFormControlElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9BC6C21C13CCC97B008E0337 /* HTMLTextFormControlElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BC6C21A13CCC97B008E0337 /* HTMLTextFormControlElement.cpp */; };
@@ -4334,8 +4318,6 @@
                A18F7A361ECA73640059E1E1 /* RuntimeApplicationChecks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A18F7A351ECA73640059E1E1 /* RuntimeApplicationChecks.cpp */; };
                A19AEA211AAA808600B52B25 /* JSMockContentFilterSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = A19AEA1E1AAA806E00B52B25 /* JSMockContentFilterSettings.h */; };
                A19AEA221AAA808A00B52B25 /* JSMockContentFilterSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A19AEA1D1AAA806E00B52B25 /* JSMockContentFilterSettings.cpp */; };
-               A19D93461A9FEC7200B46C24 /* NEFilterSourceSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A19D93441A9FEC7200B46C24 /* NEFilterSourceSPI.h */; };
-               A19D93471A9FEC7200B46C24 /* WebFilterEvaluatorSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A19D93451A9FEC7200B46C24 /* WebFilterEvaluatorSPI.h */; };
                A19D934A1AA11B1E00B46C24 /* NetworkExtensionContentFilter.mm in Sources */ = {isa = PBXBuildFile; fileRef = A19D93481AA11B1E00B46C24 /* NetworkExtensionContentFilter.mm */; };
                A19D934B1AA11B1E00B46C24 /* NetworkExtensionContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A19D93491AA11B1E00B46C24 /* NetworkExtensionContentFilter.h */; };
                A1AA9AB91D23911500FEADB3 /* ContentFilterBlockedPage.html in Resources */ = {isa = PBXBuildFile; fileRef = A1AA9AB81D23911500FEADB3 /* ContentFilterBlockedPage.html */; };
@@ -6339,18 +6321,10 @@
                CE057FA61220731100A476D5 /* DocumentMarkerController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE057FA41220731100A476D5 /* DocumentMarkerController.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 = (); }; };
-               CE1252371A15BDBE00864480 /* CoreGraphicsSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = C24685131A148E1800811792 /* CoreGraphicsSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE1252391A166FA000864480 /* QuickLookSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252381A166FA000864480 /* QuickLookSPI.h */; };
-               CE12523B1A16711000864480 /* NSFileManagerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12523A1A16711000864480 /* NSFileManagerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CE12523D1A1676CD00864480 /* QuartzCoreSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE1252411A16B1B600864480 /* MediaPlayerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252401A16B1B600864480 /* MediaPlayerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE1252431A16C01A00864480 /* CoreUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252421A16C01A00864480 /* CoreUISPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE1252491A16C3BC00864480 /* MobileGestaltSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252481A16C3BC00864480 /* MobileGestaltSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CE12524D1A1A77DE00864480 /* IOPMLibSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */; };
-               CE12524F1A1A78D200864480 /* MachVMSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12524E1A1A78D200864480 /* MachVMSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CE1252511A1BEBD800864480 /* NSCalendarDateSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252501A1BEBD800864480 /* NSCalendarDateSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CE1252531A1BEC0600864480 /* NSStringSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252521A1BEC0600864480 /* NSStringSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CE1252551A1BEC0E00864480 /* NSURLDownloadSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252541A1BEC0E00864480 /* NSURLDownloadSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE2849871CA360DF00B4A57F /* ContentSecurityPolicyDirectiveNames.h in Headers */ = {isa = PBXBuildFile; fileRef = CE2849861CA360DF00B4A57F /* ContentSecurityPolicyDirectiveNames.h */; };
                CE2849891CA3614600B4A57F /* ContentSecurityPolicyDirectiveNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE2849881CA3614600B4A57F /* ContentSecurityPolicyDirectiveNames.cpp */; };
                CE6DADF91C591E6A003F6A88 /* ContentSecurityPolicyResponseHeaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE6DADF71C591E6A003F6A88 /* ContentSecurityPolicyResponseHeaders.cpp */; };
@@ -6371,7 +6345,6 @@
                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 */; };
                CE7E17831C83A49100AD06AF /* ContentSecurityPolicyHash.h in Headers */ = {isa = PBXBuildFile; fileRef = CE7E17821C83A49100AD06AF /* ContentSecurityPolicyHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CEC337AD1A46071F009B8523 /* ServersSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC337AC1A46071F009B8523 /* ServersSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CEC337AF1A46086D009B8523 /* GraphicsServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC337AE1A46086D009B8523 /* GraphicsServicesSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                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, ); }; };
@@ -6383,7 +6356,6 @@
                CED06AD01C77754800FDFAF1 /* JSSecurityPolicyViolationEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CED06ACE1C77754800FDFAF1 /* JSSecurityPolicyViolationEvent.cpp */; };
                CED06AD11C77754800FDFAF1 /* JSSecurityPolicyViolationEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = CED06ACF1C77754800FDFAF1 /* JSSecurityPolicyViolationEvent.h */; };
                CEDA12D7152CA1CB00D9E08D /* AlternativeTextClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CEDA12D6152CA1CB00D9E08D /* AlternativeTextClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CEE27ACB1BBB53A20072400A /* pthreadSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CEE27ACA1BBB53A20072400A /* pthreadSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CEEFCD7919DB31F7003876D7 /* MediaResourceLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEEFCD7719DB31F7003876D7 /* MediaResourceLoader.cpp */; };
                CEEFCD7A19DB31F7003876D7 /* MediaResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = CEEFCD7819DB31F7003876D7 /* MediaResourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CEEFCD7C19DB33DC003876D7 /* PlatformMediaResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = CEEFCD7B19DB33DC003876D7 /* PlatformMediaResourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7700,7 +7672,6 @@
                07EE76EA1BE96DB000F89133 /* MockRealtimeVideoSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockRealtimeVideoSource.h; sourceTree = "<group>"; };
                07EE76ED1BEA619800F89133 /* MockRealtimeVideoSourceMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockRealtimeVideoSourceMac.h; sourceTree = "<group>"; };
                07EE76EE1BEA619800F89133 /* MockRealtimeVideoSourceMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MockRealtimeVideoSourceMac.mm; sourceTree = "<group>"; };
-               07F0B9791AC5DB3300E535D9 /* AVKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVKitSPI.h; sourceTree = "<group>"; };
                07F0B97B1AC5DB4600E535D9 /* AVFoundationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVFoundationSPI.h; sourceTree = "<group>"; };
                07F876831AD4A94500905849 /* MediaPlaybackTargetContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlaybackTargetContext.h; sourceTree = "<group>"; };
                07FE99DA18807A7D00256648 /* MediaElementSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaElementSession.cpp; sourceTree = "<group>"; };
@@ -8481,7 +8452,6 @@
                1AE96A861D1A0CEB00B86768 /* PaymentAuthorizationStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentAuthorizationStatus.h; sourceTree = "<group>"; };
                1AE96A871D1A0CEB00B86768 /* PaymentMerchantSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentMerchantSession.h; sourceTree = "<group>"; };
                1AEA88FF1D6CBF5E00E5AD64 /* WebKitLegacyStub.iOS.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; path = WebKitLegacyStub.iOS.tbd; sourceTree = "<group>"; };
-               1AED3BD91D3D5F260099FD78 /* PassKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PassKitSPI.h; sourceTree = "<group>"; };
                1AEF4E66170E160300AB2799 /* CachedFontClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedFontClient.h; sourceTree = "<group>"; };
                1AEF4E68170E174800AB2799 /* CachedSVGDocumentClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedSVGDocumentClient.h; sourceTree = "<group>"; };
                1AF326770D78B9440068F0C4 /* EditorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditorClient.h; sourceTree = "<group>"; };
@@ -8535,7 +8505,6 @@
                1C2649790D7E248A00BD10F2 /* DocumentLoaderMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentLoaderMac.cpp; sourceTree = "<group>"; };
                1C3249101C6D6A3B007EDB32 /* FontVariantBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontVariantBuilder.cpp; sourceTree = "<group>"; };
                1C3969CF1B74211E002BCFA7 /* FontCacheCoreText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontCacheCoreText.cpp; sourceTree = "<group>"; };
-               1C5E980F1A02CEFA002DB55F /* CoreTextSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreTextSPI.h; sourceTree = "<group>"; };
                1C6466271A12C3F90094603C /* NSFontSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSFontSPI.h; sourceTree = "<group>"; };
                1C66260E1C6E7CA600AB527C /* FontFace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFace.cpp; sourceTree = "<group>"; };
                1C66260F1C6E7CA600AB527C /* FontFace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontFace.h; sourceTree = "<group>"; };
@@ -8761,7 +8730,6 @@
                2D413F601A187A3F0041A521 /* LookupSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LookupSPI.h; sourceTree = "<group>"; };
                2D46F04D17B96FBD005647F0 /* IntPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntPoint.cpp; sourceTree = "<group>"; };
                2D46F04F17B96FD2005647F0 /* IntSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntSize.cpp; sourceTree = "<group>"; };
-               2D4AEA021EBC0FE900C4A93A /* LinkPresentationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkPresentationSPI.h; sourceTree = "<group>"; };
                2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextIndicator.cpp; sourceTree = "<group>"; };
                2D4F96F21A1ECC240098BF88 /* TextIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextIndicator.h; sourceTree = "<group>"; };
                2D4F96F31A1ECC240098BF88 /* TextIndicatorWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextIndicatorWindow.h; sourceTree = "<group>"; };
@@ -8861,7 +8829,6 @@
                2DCB837719F99BBA00A7FBE4 /* NSSharingServicePickerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSSharingServicePickerSPI.h; sourceTree = "<group>"; };
                2DCB837819F99BBA00A7FBE4 /* NSSharingServiceSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSSharingServiceSPI.h; sourceTree = "<group>"; };
                2DD5A7261EBEE47D009BA597 /* CompositionUnderline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompositionUnderline.h; sourceTree = "<group>"; };
-               2DDB97F319F9AECA002025D8 /* NSExtensionSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSExtensionSPI.h; sourceTree = "<group>"; };
                2DE70022192FE82A00B0975C /* DisplayRefreshMonitorMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisplayRefreshMonitorMac.h; sourceTree = "<group>"; };
                2DF512CB1D873E47001D6780 /* ReplaceRangeWithTextCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReplaceRangeWithTextCommand.cpp; sourceTree = "<group>"; };
                2DF512CC1D873E47001D6780 /* ReplaceRangeWithTextCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReplaceRangeWithTextCommand.h; sourceTree = "<group>"; };
@@ -9195,8 +9162,6 @@
                31A795C51888BAD100382F90 /* JSANGLEInstancedArrays.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSANGLEInstancedArrays.h; sourceTree = "<group>"; };
                31AA003F1EF44829009DFC06 /* SQLite3SPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SQLite3SPI.h; sourceTree = "<group>"; };
                31AB4FFF122878A2001A7DB0 /* GraphicsContext3DIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsContext3DIOS.h; sourceTree = "<group>"; };
-               31B313DA1B69871600F2AABC /* NSURLConnectionSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSURLConnectionSPI.h; sourceTree = "<group>"; };
-               31B313DE1B6988C500F2AABC /* NSButtonCellSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSButtonCellSPI.h; sourceTree = "<group>"; };
                31BC742B1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSAnimationTriggerScrollValue.cpp; sourceTree = "<group>"; };
                31BC742C1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSAnimationTriggerScrollValue.h; sourceTree = "<group>"; };
                31C0FF1B0E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitAnimationEvent.cpp; sourceTree = "<group>"; };
@@ -9215,7 +9180,6 @@
                31DCDF421DA1C45400EA5B93 /* ExtendedColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtendedColor.h; sourceTree = "<group>"; };
                31DEA4531B39F4D900F77178 /* WebSystemBackdropLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebSystemBackdropLayer.mm; sourceTree = "<group>"; };
                31DEA4541B39F4D900F77178 /* WebSystemBackdropLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSystemBackdropLayer.h; sourceTree = "<group>"; };
-               31DF63561AF187DD0078FD91 /* NSColorSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSColorSPI.h; sourceTree = "<group>"; };
                31E8D8BA160BC94B004CE8F5 /* RenderSnapshottedPlugIn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSnapshottedPlugIn.cpp; sourceTree = "<group>"; };
                31E8D8BB160BC94C004CE8F5 /* RenderSnapshottedPlugIn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSnapshottedPlugIn.h; sourceTree = "<group>"; };
                31EAF97C121435A400E7C1BF /* DeviceMotionClientIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceMotionClientIOS.h; sourceTree = "<group>"; };
@@ -9649,9 +9613,6 @@
                44D8DA9A139545CD00337B75 /* SVGAnimateMotionElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SVGAnimateMotionElement.idl; sourceTree = "<group>"; };
                44DAB5AF15A623580097C1E4 /* Extensions3DOpenGLCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Extensions3DOpenGLCommon.cpp; sourceTree = "<group>"; };
                44DAB5B015A623580097C1E4 /* Extensions3DOpenGLCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Extensions3DOpenGLCommon.h; sourceTree = "<group>"; };
-               44DEF6421A6FF92700D45EEC /* IOReturnSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOReturnSPI.h; sourceTree = "<group>"; };
-               44DFF6421A6FF92700D45EEC /* IOSurfaceSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOSurfaceSPI.h; sourceTree = "<group>"; };
-               44EFF6421A6FF92700D45EEC /* IOTypesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOTypesSPI.h; sourceTree = "<group>"; };
                450CEBEE15073BBE002BB149 /* LabelableElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LabelableElement.cpp; sourceTree = "<group>"; };
                450CEBEF15073BBE002BB149 /* LabelableElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelableElement.h; sourceTree = "<group>"; };
                4512502015DCE37D002F84E2 /* SpinButtonElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpinButtonElement.cpp; sourceTree = "<group>"; };
@@ -10312,7 +10273,6 @@
                55A336F81D821E3C0022C4C7 /* ImageBackingStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageBackingStore.h; sourceTree = "<group>"; };
                55AF14E31EAAC59B0026EEAA /* UTIRegistry.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UTIRegistry.cpp; sourceTree = "<group>"; };
                55AF14E41EAAC59B0026EEAA /* UTIRegistry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UTIRegistry.h; sourceTree = "<group>"; };
-               55B2BDD61EA923A400BFFCBD /* ImageIOSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageIOSPI.h; sourceTree = "<group>"; };
                55D408F71A7C631800C78450 /* SVGImageClients.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGImageClients.h; sourceTree = "<group>"; };
                570440571E53851600356601 /* CryptoAlgorithmAES_CFBMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmAES_CFBMac.cpp; sourceTree = "<group>"; };
                570440591E53936200356601 /* JSAesCbcCfbParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAesCbcCfbParams.h; sourceTree = "<group>"; };
@@ -10645,7 +10605,6 @@
                6515EC8F0D9723FF0063D49A /* JSSVGAltGlyphElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGAltGlyphElement.cpp; sourceTree = "<group>"; };
                6515EC900D9723FF0063D49A /* JSSVGAltGlyphElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGAltGlyphElement.h; sourceTree = "<group>"; };
                652FBBBB0DE27CB60001D386 /* JSDOMWindowCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMWindowCustom.h; sourceTree = "<group>"; };
-               653EF83819A043AE0052202C /* NSURLFileTypeMappingsSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSURLFileTypeMappingsSPI.h; sourceTree = "<group>"; };
                6548E24809E1E04D00AF8020 /* Document.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Document.idl; sourceTree = "<group>"; };
                6550B693099DF0270090D781 /* CDATASection.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CDATASection.cpp; sourceTree = "<group>"; };
                6550B694099DF0270090D781 /* CDATASection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CDATASection.h; sourceTree = "<group>"; };
@@ -11959,7 +11918,6 @@
                9332AB8B1653A97900D827EC /* FELightingNEON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FELightingNEON.h; sourceTree = "<group>"; };
                9332AB8C1653A97900D827EC /* NEONHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NEONHelpers.h; sourceTree = "<group>"; };
                93354A3B0B24F8C9003F6DEA /* UIEventWithKeyState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIEventWithKeyState.cpp; sourceTree = "<group>"; };
-               9335B49B1DCBEF7100ED468E /* NSTouchBarSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSTouchBarSPI.h; sourceTree = "<group>"; };
                933A142B0B7D188600A53FFD /* TextEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextEvent.cpp; sourceTree = "<group>"; };
                933A142C0B7D188600A53FFD /* TextEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TextEvent.idl; sourceTree = "<group>"; };
                933A142D0B7D188600A53FFD /* TextEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextEvent.h; sourceTree = "<group>"; };
@@ -11989,7 +11947,6 @@
                935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformWheelEvent.h; sourceTree = "<group>"; };
                935C476E09AC4D7300A6AAB4 /* KeyEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KeyEventMac.mm; sourceTree = "<group>"; };
                935C477409AC4D8D00A6AAB4 /* GapRects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GapRects.h; sourceTree = "<group>"; };
-               935E2B4D1AFF06CA00976F9F /* DataDetectorsCoreSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataDetectorsCoreSPI.h; sourceTree = "<group>"; };
                935F45400F7C3B5F00D7C1FB /* JSLazyEventListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSLazyEventListener.cpp; sourceTree = "<group>"; };
                935F45410F7C3B5F00D7C1FB /* JSLazyEventListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSLazyEventListener.h; sourceTree = "<group>"; };
                935FBC4409BA00B900E230B1 /* EventListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventListener.h; sourceTree = "<group>"; };
@@ -12502,7 +12459,6 @@
                9BAB6C6A12550631001626D4 /* EditingStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingStyle.h; sourceTree = "<group>"; };
                9BAB6C6B12550631001626D4 /* EditingStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditingStyle.cpp; sourceTree = "<group>"; };
                9BAF3B2312C1A39800014BF1 /* WritingDirection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritingDirection.h; sourceTree = "<group>"; };
-               9BB737641B41C03500AE13EB /* NSAttributedStringSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSAttributedStringSPI.h; sourceTree = "<group>"; };
                9BC5F9DE1D5AAD5D002B749D /* CustomElementRegistry.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CustomElementRegistry.idl; sourceTree = "<group>"; };
                9BC5F9DF1D5AAF6A002B749D /* JSCustomElementRegistryCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomElementRegistryCustom.cpp; sourceTree = "<group>"; };
                9BC6C21913CCC97B008E0337 /* HTMLTextFormControlElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLTextFormControlElement.h; sourceTree = "<group>"; };
@@ -12617,8 +12573,6 @@
                A19AEA1C1AAA7C4900B52B25 /* MockContentFilterSettings.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = MockContentFilterSettings.idl; sourceTree = "<group>"; };
                A19AEA1D1AAA806E00B52B25 /* JSMockContentFilterSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMockContentFilterSettings.cpp; sourceTree = "<group>"; };
                A19AEA1E1AAA806E00B52B25 /* JSMockContentFilterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMockContentFilterSettings.h; sourceTree = "<group>"; };
-               A19D93441A9FEC7200B46C24 /* NEFilterSourceSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NEFilterSourceSPI.h; sourceTree = "<group>"; };
-               A19D93451A9FEC7200B46C24 /* WebFilterEvaluatorSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFilterEvaluatorSPI.h; sourceTree = "<group>"; };
                A19D93481AA11B1E00B46C24 /* NetworkExtensionContentFilter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkExtensionContentFilter.mm; sourceTree = "<group>"; };
                A19D93491AA11B1E00B46C24 /* NetworkExtensionContentFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkExtensionContentFilter.h; sourceTree = "<group>"; };
                A1AA9AB81D23911500FEADB3 /* ContentFilterBlockedPage.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = ContentFilterBlockedPage.html; sourceTree = "<group>"; };
@@ -14532,7 +14486,6 @@
                C2015C091BE6FE2C00822389 /* FontVariantBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FontVariantBuilder.h; sourceTree = "<group>"; };
                C21DF2E71D9E4E9900F5B24C /* CSSFontVariationValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontVariationValue.cpp; sourceTree = "<group>"; };
                C21DF2E81D9E4E9900F5B24C /* CSSFontVariationValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFontVariationValue.h; sourceTree = "<group>"; };
-               C24685131A148E1800811792 /* CoreGraphicsSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreGraphicsSPI.h; sourceTree = "<group>"; };
                C26017A11C72DC9900F74A16 /* CSSFontFaceSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontFaceSet.cpp; sourceTree = "<group>"; };
                C26017A21C72DC9900F74A16 /* CSSFontFaceSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFontFaceSet.h; sourceTree = "<group>"; };
                C280833C1C6DB194001451B6 /* FontFace.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = FontFace.idl; sourceTree = "<group>"; };
@@ -14696,7 +14649,6 @@
                CD3E251B18046B0600E27F56 /* GridArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GridArea.h; sourceTree = "<group>"; };
                CD3E252118046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSGridTemplateAreasValue.cpp; sourceTree = "<group>"; };
                CD3E252218046BCD00E27F56 /* CSSGridTemplateAreasValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSGridTemplateAreasValue.h; sourceTree = "<group>"; };
-               CD4097FF1A8C855F004C65E9 /* CFNSURLConnectionSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFNSURLConnectionSPI.h; sourceTree = "<group>"; };
                CD4AC5281496AE2F0087C4EF /* Composite.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = Composite.wav; path = platform/audio/resources/Composite.wav; sourceTree = SOURCE_ROOT; };
                CD4BE5291CE13425009D87DA /* GenericTaskQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GenericTaskQueue.cpp; sourceTree = "<group>"; };
                CD4E0AFA11F7BC27009D3811 /* fullscreen.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = fullscreen.css; sourceTree = "<group>"; };
@@ -14848,7 +14800,6 @@
                CDCD41E51C3DDB0900965D99 /* ParsedContentRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParsedContentRange.cpp; sourceTree = "<group>"; };
                CDCD41E61C3DDB0900965D99 /* ParsedContentRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParsedContentRange.h; sourceTree = "<group>"; };
                CDCE5CD014633BC900D47CCA /* EventTargetFactory.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EventTargetFactory.in; sourceTree = "<group>"; };
-               CDCEA92A1EE76D9800E7552B /* IOPSLibSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IOPSLibSPI.h; sourceTree = "<group>"; };
                CDCFABBB18C0AE31006F8450 /* SelectionSubtreeRoot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectionSubtreeRoot.h; sourceTree = "<group>"; };
                CDCFABBC18C0AF19006F8450 /* SelectionSubtreeRoot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectionSubtreeRoot.cpp; sourceTree = "<group>"; };
                CDD1E525167BA56400CE820B /* TextTrackRepresentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackRepresentation.h; sourceTree = "<group>"; };
@@ -14933,16 +14884,9 @@
                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>"; };
                CE1252381A166FA000864480 /* QuickLookSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookSPI.h; sourceTree = "<group>"; };
-               CE12523A1A16711000864480 /* NSFileManagerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSFileManagerSPI.h; sourceTree = "<group>"; };
-               CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuartzCoreSPI.h; sourceTree = "<group>"; };
                CE1252401A16B1B600864480 /* MediaPlayerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerSPI.h; sourceTree = "<group>"; };
                CE1252421A16C01A00864480 /* CoreUISPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreUISPI.h; sourceTree = "<group>"; };
                CE1252481A16C3BC00864480 /* MobileGestaltSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobileGestaltSPI.h; sourceTree = "<group>"; };
-               CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOPMLibSPI.h; sourceTree = "<group>"; };
-               CE12524E1A1A78D200864480 /* MachVMSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachVMSPI.h; sourceTree = "<group>"; };
-               CE1252501A1BEBD800864480 /* NSCalendarDateSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSCalendarDateSPI.h; sourceTree = "<group>"; };
-               CE1252521A1BEC0600864480 /* NSStringSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSStringSPI.h; sourceTree = "<group>"; };
-               CE1252541A1BEC0E00864480 /* NSURLDownloadSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSURLDownloadSPI.h; sourceTree = "<group>"; };
                CE2849861CA360DF00B4A57F /* ContentSecurityPolicyDirectiveNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ContentSecurityPolicyDirectiveNames.h; path = csp/ContentSecurityPolicyDirectiveNames.h; sourceTree = "<group>"; };
                CE2849881CA3614600B4A57F /* ContentSecurityPolicyDirectiveNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ContentSecurityPolicyDirectiveNames.cpp; path = csp/ContentSecurityPolicyDirectiveNames.cpp; sourceTree = "<group>"; };
                CE5CB1B314EDAB6F00BB2795 /* EventSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventSender.h; sourceTree = "<group>"; };
@@ -14965,7 +14909,6 @@
                CE7B2DB11586ABAD0098B3FA /* TextAlternativeWithRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextAlternativeWithRange.h; sourceTree = "<group>"; };
                CE7B2DB21586ABAD0098B3FA /* TextAlternativeWithRange.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextAlternativeWithRange.mm; sourceTree = "<group>"; };
                CE7E17821C83A49100AD06AF /* ContentSecurityPolicyHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ContentSecurityPolicyHash.h; path = csp/ContentSecurityPolicyHash.h; sourceTree = "<group>"; };
-               CEC337AC1A46071F009B8523 /* ServersSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServersSPI.h; sourceTree = "<group>"; };
                CEC337AE1A46086D009B8523 /* GraphicsServicesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsServicesSPI.h; sourceTree = "<group>"; };
                CECADFC2153778FF00E37068 /* DictationAlternative.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DictationAlternative.cpp; sourceTree = "<group>"; };
                CECADFC3153778FF00E37068 /* DictationAlternative.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DictationAlternative.h; sourceTree = "<group>"; };
@@ -14977,7 +14920,6 @@
                CED06ACE1C77754800FDFAF1 /* JSSecurityPolicyViolationEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSecurityPolicyViolationEvent.cpp; sourceTree = "<group>"; };
                CED06ACF1C77754800FDFAF1 /* JSSecurityPolicyViolationEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSecurityPolicyViolationEvent.h; sourceTree = "<group>"; };
                CEDA12D6152CA1CB00D9E08D /* AlternativeTextClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlternativeTextClient.h; sourceTree = "<group>"; };
-               CEE27ACA1BBB53A20072400A /* pthreadSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pthreadSPI.h; sourceTree = "<group>"; };
                CEEFCD7719DB31F7003876D7 /* MediaResourceLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaResourceLoader.cpp; sourceTree = "<group>"; };
                CEEFCD7819DB31F7003876D7 /* MediaResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaResourceLoader.h; sourceTree = "<group>"; };
                CEEFCD7B19DB33DC003876D7 /* PlatformMediaResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformMediaResourceLoader.h; sourceTree = "<group>"; };
@@ -17326,15 +17268,6 @@
                        tabWidth = 8;
                        usesTabs = 0;
                };
-               1C9203F21A13D4660053192A /* cg */ = {
-                       isa = PBXGroup;
-                       children = (
-                               C24685131A148E1800811792 /* CoreGraphicsSPI.h */,
-                               55B2BDD61EA923A400BFFCBD /* ImageIOSPI.h */,
-                       );
-                       path = cg;
-                       sourceTree = "<group>";
-               };
                1CDD44660BA9C80000F90147 /* Configurations */ = {
                        isa = PBXGroup;
                        children = (
@@ -18892,49 +18825,12 @@
                653EF83619A043AE0052202C /* spi */ = {
                        isa = PBXGroup;
                        children = (
-                               1C9203F21A13D4660053192A /* cg */,
-                               653EF83719A043AE0052202C /* cocoa */,
                                A172182419DE182B00464D17 /* ios */,
                                9348428019F1A9190009D5AE /* mac */,
                        );
                        path = spi;
                        sourceTree = "<group>";
                };
-               653EF83719A043AE0052202C /* cocoa */ = {
-                       isa = PBXGroup;
-                       children = (
-                               07F0B9791AC5DB3300E535D9 /* AVKitSPI.h */,
-                               CD4097FF1A8C855F004C65E9 /* CFNSURLConnectionSPI.h */,
-                               1C5E980F1A02CEFA002DB55F /* CoreTextSPI.h */,
-                               935E2B4D1AFF06CA00976F9F /* DataDetectorsCoreSPI.h */,
-                               CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */,
-                               CDCEA92A1EE76D9800E7552B /* IOPSLibSPI.h */,
-                               44DEF6421A6FF92700D45EEC /* IOReturnSPI.h */,
-                               44DFF6421A6FF92700D45EEC /* IOSurfaceSPI.h */,
-                               44EFF6421A6FF92700D45EEC /* IOTypesSPI.h */,
-                               2D4AEA021EBC0FE900C4A93A /* LinkPresentationSPI.h */,
-                               CE12524E1A1A78D200864480 /* MachVMSPI.h */,
-                               A19D93441A9FEC7200B46C24 /* NEFilterSourceSPI.h */,
-                               9BB737641B41C03500AE13EB /* NSAttributedStringSPI.h */,
-                               31B313DE1B6988C500F2AABC /* NSButtonCellSPI.h */,
-                               CE1252501A1BEBD800864480 /* NSCalendarDateSPI.h */,
-                               31DF63561AF187DD0078FD91 /* NSColorSPI.h */,
-                               2DDB97F319F9AECA002025D8 /* NSExtensionSPI.h */,
-                               CE12523A1A16711000864480 /* NSFileManagerSPI.h */,
-                               CE1252521A1BEC0600864480 /* NSStringSPI.h */,
-                               9335B49B1DCBEF7100ED468E /* NSTouchBarSPI.h */,
-                               31B313DA1B69871600F2AABC /* NSURLConnectionSPI.h */,
-                               CE1252541A1BEC0E00864480 /* NSURLDownloadSPI.h */,
-                               653EF83819A043AE0052202C /* NSURLFileTypeMappingsSPI.h */,
-                               1AED3BD91D3D5F260099FD78 /* PassKitSPI.h */,
-                               CEE27ACA1BBB53A20072400A /* pthreadSPI.h */,
-                               CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */,
-                               CEC337AC1A46071F009B8523 /* ServersSPI.h */,
-                               A19D93451A9FEC7200B46C24 /* WebFilterEvaluatorSPI.h */,
-                       );
-                       path = cocoa;
-                       sourceTree = "<group>";
-               };
                656580EC09D12B20000E61D7 /* Derived Sources */ = {
                        isa = PBXGroup;
                        children = (
@@ -26688,7 +26584,6 @@
                                CDC675231EAEA9B700727C84 /* AVAudioSessionCaptureDeviceManager.h in Headers */,
                                070363E2181A1CDC00C074A5 /* AVCaptureDeviceManager.h in Headers */,
                                07F0B97C1AC5DB4600E535D9 /* AVFoundationSPI.h in Headers */,
-                               07F0B97A1AC5DB3300E535D9 /* AVKitSPI.h in Headers */,
                                070363E4181A1CDC00C074A5 /* AVMediaCaptureSource.h in Headers */,
                                CD336F6217F9F64700DDDCD0 /* AVTrackPrivateAVFObjCImpl.h in Headers */,
                                070363E6181A1CDC00C074A5 /* AVVideoCaptureSource.h in Headers */,
@@ -26902,9 +26797,7 @@
                                3F8020351E9E47BF00DEC61D /* CoreAudioCaptureDevice.h in Headers */,
                                3F8020371E9E47C500DEC61D /* CoreAudioCaptureDeviceManager.h in Headers */,
                                07AFF4221EFB144900B545B3 /* CoreAudioCaptureSourceIOS.h in Headers */,
-                               CE1252371A15BDBE00864480 /* CoreGraphicsSPI.h in Headers */,
                                443818001A91B2F8006E04F2 /* CoreMediaSoftLink.h in Headers */,
-                               1C6466251A12C38E0094603C /* CoreTextSPI.h in Headers */,
                                CE1252431A16C01A00864480 /* CoreUISPI.h in Headers */,
                                CD7D33481C7A16BF00041293 /* CoreVideoSoftLink.h in Headers */,
                                862F129E18C1576F005C54AF /* CountedUserActivity.h in Headers */,
@@ -27114,7 +27007,6 @@
                                BE23480D18A9871400E4B6E8 /* DataCue.h in Headers */,
                                C5227DF11C3C6DF100F5ED54 /* DataDetection.h in Headers */,
                                7C7941E51C56C29300A4C58E /* DataDetectorsCoreSoftLink.h in Headers */,
-                               935E2B4E1AFF06CA00976F9F /* DataDetectorsCoreSPI.h in Headers */,
                                2D59F1BF1A0044C6001F3D29 /* DataDetectorsSPI.h in Headers */,
                                2DC4CF791D2DD98900ECCC94 /* DataDetectorsUISPI.h in Headers */,
                                BC22746F0E83664500E7F975 /* DataRef.h in Headers */,
@@ -27740,7 +27632,6 @@
                                5576A5651D88A70800CCC04C /* ImageFrame.h in Headers */,
                                5597F8271D91C3130066BC21 /* ImageFrameCache.h in Headers */,
                                F55B3DC21251F12D003EF269 /* ImageInputType.h in Headers */,
-                               55B2BDD71EA923A400BFFCBD /* ImageIOSPI.h in Headers */,
                                089582560E857A7E00F82C83 /* ImageLoader.h in Headers */,
                                BC7F44A80B9E324E00A9D081 /* ImageObserver.h in Headers */,
                                2D5A5931152525D00036EE51 /* ImageOrientation.h in Headers */,
@@ -27827,12 +27718,8 @@
                                E134F5AB12EE343F004EC58D /* IntRectHash.h in Headers */,
                                B27535750B053814002CE64F /* IntSize.h in Headers */,
                                B27535760B053814002CE64F /* IntSizeHash.h in Headers */,
-                               CE12524D1A1A77DE00864480 /* IOPMLibSPI.h in Headers */,
-                               44DEF6431A6FF92700D45EEC /* IOReturnSPI.h in Headers */,
                                2D0B4AAB18DA1CCD00434DE1 /* IOSurface.h in Headers */,
                                1C21E57D183ED1FF001C289D /* IOSurfacePool.h in Headers */,
-                               44DFF6431A6FF92700D45EEC /* IOSurfaceSPI.h in Headers */,
-                               44EFF6431A6FF92700D45EEC /* IOTypesSPI.h in Headers */,
                                07AC47021952102100EE9723 /* ISOVTTCue.h in Headers */,
                                418F88050FF957AF0080F045 /* JSAbstractWorker.h in Headers */,
                                5704405A1E53936200356601 /* JSAesCbcCfbParams.h in Headers */,
@@ -28651,7 +28538,6 @@
                                98CE432A129E00E5005821DC /* LinkLoader.h in Headers */,
                                984264F112D5280A000D88A4 /* LinkLoaderClient.h in Headers */,
                                CBB6B2D41CB7AE51009EDE1A /* LinkPreloadResourceClients.h in Headers */,
-                               2D4AEA031EBC0FE900C4A93A /* LinkPresentationSPI.h in Headers */,
                                985BB96E13A94058007A0B69 /* LinkRelAttribute.h in Headers */,
                                BC7FA6210D1F0CBD00DB22A9 /* LiveNodeList.h in Headers */,
                                E3B2F0F01D7F4CB500B0C9D1 /* LoadableClassicScript.h in Headers */,
@@ -28677,7 +28563,6 @@
                                2D413F611A187A3F0041A521 /* LookupSPI.h in Headers */,
                                46EFAF121E5FB9F100E7F34B /* LowPowerModeNotifier.h in Headers */,
                                1A0409DC1A4360B5009E47F3 /* MachSendRight.h in Headers */,
-                               CE12524F1A1A78D200864480 /* MachVMSPI.h in Headers */,
                                932AD70617EFA2C40038F8FF /* MainFrame.h in Headers */,
                                7AE6C93C1BE0C60100E19E03 /* MainThreadSharedTimer.h in Headers */,
                                1A8F6BC60DB55CDC001DB794 /* ManifestParser.h in Headers */,
@@ -28861,7 +28746,6 @@
                                9711460414EF009A00674FD9 /* NavigatorGeolocation.h in Headers */,
                                5EA725D61ACABD5700EAD17B /* NavigatorMediaDevices.h in Headers */,
                                996E59DF1DF0128D006612B9 /* NavigatorWebDriver.h in Headers */,
-                               A19D93461A9FEC7200B46C24 /* NEFilterSourceSPI.h in Headers */,
                                8A309C9F123950BE00CB9204 /* NestingLevelIncrementer.h in Headers */,
                                656D37430ADBA5DE00A4554D /* NetscapePlugInStreamLoader.h in Headers */,
                                A19D934B1AA11B1E00B46C24 /* NetworkExtensionContentFilter.h in Headers */,
@@ -28902,13 +28786,7 @@
                                1A927FD41416A15B003A83C8 /* nptypes.h in Headers */,
                                2D77AC291BF2B9860072470A /* NSAccessibilitySPI.h in Headers */,
                                2D77AC2A1BF2B9870072470A /* NSApplicationSPI.h in Headers */,
-                               9BB737651B41C03500AE13EB /* NSAttributedStringSPI.h in Headers */,
-                               31B313DF1B6988C500F2AABC /* NSButtonCellSPI.h in Headers */,
-                               CE1252511A1BEBD800864480 /* NSCalendarDateSPI.h in Headers */,
-                               31DF63571AF187DD0078FD91 /* NSColorSPI.h in Headers */,
                                2DB9C4AA1B3231F40070F27F /* NSEventSPI.h in Headers */,
-                               2DDB97F419F9AECA002025D8 /* NSExtensionSPI.h in Headers */,
-                               CE12523B1A16711000864480 /* NSFileManagerSPI.h in Headers */,
                                1C6466281A12C4200094603C /* NSFontSPI.h in Headers */,
                                9321D5901A390704008052BE /* NSImmediateActionGestureRecognizerSPI.h in Headers */,
                                937F4CCE1A2D4B0100BB39F5 /* NSMenuSPI.h in Headers */,
@@ -28918,12 +28796,7 @@
                                2DCB837919F99BBA00A7FBE4 /* NSSharingServicePickerSPI.h in Headers */,
                                2DCB837A19F99BBA00A7FBE4 /* NSSharingServiceSPI.h in Headers */,
                                933C7A751C0FBC440034FB97 /* NSSpellCheckerSPI.h in Headers */,
-                               CE1252531A1BEC0600864480 /* NSStringSPI.h in Headers */,
                                2D77AC2B1BF2B9870072470A /* NSTextFinderSPI.h in Headers */,
-                               9335B49D1DCBEF7C00ED468E /* NSTouchBarSPI.h in Headers */,
-                               31B313DB1B69871600F2AABC /* NSURLConnectionSPI.h in Headers */,
-                               CE1252551A1BEC0E00864480 /* NSURLDownloadSPI.h in Headers */,
-                               658F540319A1C9240088FC92 /* NSURLFileTypeMappingsSPI.h in Headers */,
                                2D77AC2D1BF2B9A00072470A /* NSViewSPI.h in Headers */,
                                2D0CF8171BCF5DE1007A4937 /* NSWindowSPI.h in Headers */,
                                F55B3DC81251F12D003EF269 /* NumberInputType.h in Headers */,
@@ -28986,7 +28859,6 @@
                                447958041643B49A001E0A7F /* ParsedContentType.h in Headers */,
                                BC76AC130DD7AD5C00415F34 /* ParserUtilities.h in Headers */,
                                536D5A23193E8E0C00CE4CAB /* ParsingUtilities.h in Headers */,
-                               1AED3BDA1D3D5F260099FD78 /* PassKitSPI.h in Headers */,
                                57B5F7ED1E57F1E300F34F90 /* PasswordCredential.h in Headers */,
                                77D5100C1ED5E29000DA4C87 /* PasswordCredentialData.h in Headers */,
                                F55B3DCA1251F12D003EF269 /* PasswordInputType.h in Headers */,
@@ -29118,12 +28990,10 @@
                                51A052561058874000CC9E95 /* ProtectionSpaceHash.h in Headers */,
                                1AF8E11A1256592600230FF7 /* ProxyServer.h in Headers */,
                                FF945ECC161F7F3600971BC8 /* PseudoElement.h in Headers */,
-                               CEE27ACB1BBB53A20072400A /* pthreadSPI.h in Headers */,
                                0081FF0016B0A2D3008AAA7A /* PublicSuffix.h in Headers */,
                                10FB084B14E15C7E00A3DB98 /* PublicURLManager.h in Headers */,
                                550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */,
                                83C1F5941EDF69D300410D27 /* QualifiedNameCache.h in Headers */,
-                               CE12523D1A1676CD00864480 /* QuartzCoreSPI.h in Headers */,
                                A15E31F41E0CB0B5004B371C /* QuickLook.h in Headers */,
                                937F4CCC1A2D48C100BB39F5 /* QuickLookMacSPI.h in Headers */,
                                443918001A91B2F8006E04F2 /* QuickLookSoftLink.h in Headers */,
@@ -29493,7 +29363,6 @@
                                077AF14318F4B1BB0001ED61 /* SerializedPlatformRepresentationMac.h in Headers */,
                                A75E497610752ACB00C9B896 /* SerializedScriptValue.h in Headers */,
                                516F7F6D1C31E39A00F111DC /* ServerOpenDBRequest.h in Headers */,
-                               CEC337AD1A46071F009B8523 /* ServersSPI.h in Headers */,
                                2D93AEE319DF5641002A86C3 /* ServicesOverlayController.h in Headers */,
                                5182C23F1F313A090059BA7C /* ServiceWorker.h in Headers */,
                                5182C2411F313A090059BA7C /* ServiceWorkerContainer.h in Headers */,
@@ -30169,7 +30038,6 @@
                                A5E616741894581F009ADF50 /* WebDebuggerAgent.h in Headers */,
                                FE0D84E910484348001A179E /* WebEvent.h in Headers */,
                                225A16B50D5C11E900090295 /* WebEventRegion.h in Headers */,
-                               A19D93471A9FEC7200B46C24 /* WebFilterEvaluatorSPI.h in Headers */,
                                D3F3D36E1A69B7E00059FC2B /* WebGL2RenderingContext.h in Headers */,
                                A7D20F6D107F438B00A80392 /* WebGLActiveInfo.h in Headers */,
                                6E47E66110B7944B00B186C8 /* WebGLAny.h in Headers */,

diff --git a/Source/WebCore/editing/cocoa/EditorCocoa.mm b/Source/WebCore/editing/cocoa/EditorCocoa.mm
index 39b848f0b7b805e107f34009cbb833c3fb062f9c..7d1c2e97830c42c695e646f75daf0d6e335d5c07 100644 (file)
--- a/Source/WebCore/editing/cocoa/EditorCocoa.mm
+++ b/Source/WebCore/editing/cocoa/EditorCocoa.mm
@@ -44,11 +44,11 @@
 #import "HTMLImageElement.h"
 #import "HTMLSpanElement.h"
 #import "LegacyWebArchive.h"
-#import "NSAttributedStringSPI.h"
 #import "Pasteboard.h"
 #import "RenderElement.h"
 #import "RenderStyle.h"
 #import "Text.h"
+#import <pal/spi/cocoa/NSAttributedStringSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 #import <wtf/SoftLinking.h>
 

diff --git a/Source/WebCore/editing/cocoa/HTMLConverter.mm b/Source/WebCore/editing/cocoa/HTMLConverter.mm
index 9c0e689327e2983664732b2b30a7b713d2614022..bc5f29c5fe06c136529bdfd8880da06d4845b05a 100644 (file)
--- a/Source/WebCore/editing/cocoa/HTMLConverter.mm
+++ b/Source/WebCore/editing/cocoa/HTMLConverter.mm
@@ -54,7 +54,6 @@
 #import "HTMLTableCellElement.h"
 #import "HTMLTextAreaElement.h"
 #import "LoaderNSURLExtras.h"
-#import "NSAttributedStringSPI.h"
 #import "RGBColor.h"
 #import "RenderImage.h"
 #import "RenderText.h"
@@ -62,6 +61,7 @@
 #import "StyledElement.h"
 #import "TextIterator.h"
 #import <objc/runtime.h>
+#import <pal/spi/cocoa/NSAttributedStringSPI.h>
 #import <wtf/ASCIICType.h>
 #import <wtf/SoftLinking.h>
 #import <wtf/text/StringBuilder.h>

diff --git a/Source/WebCore/editing/ios/EditorIOS.mm b/Source/WebCore/editing/ios/EditorIOS.mm
index 8f10b1164cd1f1ec0d6184fff3575311752dea51..6ee4f71136cef090ff02f99bfa6cff1224c2dd89 100644 (file)
--- a/Source/WebCore/editing/ios/EditorIOS.mm
+++ b/Source/WebCore/editing/ios/EditorIOS.mm
@@ -49,7 +49,6 @@
 #import "HTMLParserIdioms.h"
 #import "HTMLTextAreaElement.h"
 #import "LegacyWebArchive.h"
-#import "NSAttributedStringSPI.h"
 #import "NodeTraversal.h"
 #import "Page.h"
 #import "Pasteboard.h"
@@ -62,6 +61,7 @@
 #import "WAKAppKitStubs.h"
 #import "markup.h"
 #import <MobileCoreServices/MobileCoreServices.h>
+#import <pal/spi/cocoa/NSAttributedStringSPI.h>
 #import <wtf/SoftLinking.h>
 #import <wtf/text/StringBuilder.h>
 

diff --git a/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm b/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm
index e17329f26fcb967fc68d2867ee9e7eab6a5a70af..55462076dc0ad8d77ff39544689e604011da353d 100644 (file)
--- a/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm
+++ b/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm
@@ -28,11 +28,11 @@
 
 #if ENABLE(RESOURCE_USAGE)
 
-#include "MachVMSPI.h"
 #include <JavaScriptCore/GCActivityCallback.h>
 #include <heap/Heap.h>
 #include <mach/mach.h>
 #include <mach/vm_statistics.h>
+#include <pal/spi/cocoa/MachVMSPI.h>
 #include <runtime/VM.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/page/mac/TextIndicatorWindow.mm b/Source/WebCore/page/mac/TextIndicatorWindow.mm
index fc36dcb13ced7e5ac2cf01773ace793214660dd1..945dab09e5d351b83a0088df7c1ab2b48b9d48e0 100644 (file)
--- a/Source/WebCore/page/mac/TextIndicatorWindow.mm
+++ b/Source/WebCore/page/mac/TextIndicatorWindow.mm
@@ -28,13 +28,13 @@
 
 #if PLATFORM(MAC)
 
-#import "CoreGraphicsSPI.h"
 #import "GeometryUtilities.h"
 #import "GraphicsContext.h"
 #import "PathUtilities.h"
-#import "QuartzCoreSPI.h"
 #import "TextIndicator.h"
 #import "WebActionDisablingCALayerDelegate.h"
+#import <pal/spi/cg/CoreGraphicsSPI.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 
 const CFTimeInterval bounceAnimationDuration = 0.12;
 const CFTimeInterval bounceWithCrossfadeAnimationDuration = 0.3;

diff --git a/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm b/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm
index 4e891f9707ce461704399533874ee04e18984098..ae95eacded827cdc987a7def699617a252c387fe 100644 (file)
--- a/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm
+++ b/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm
@@ -41,7 +41,7 @@
 #import "WebCoreThreadRun.h"
 
 #if HAVE(PARENTAL_CONTROLS)
-#import "WebFilterEvaluatorSPI.h"
+#import <pal/spi/cocoa/WebFilterEvaluatorSPI.h>
 #import <wtf/SoftLinking.h>
 
 SOFT_LINK_PRIVATE_FRAMEWORK(WebContentAnalysis);

diff --git a/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h b/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h
index ba447740f328aff72135cd527e7c99e5d2780bef..5a33b571bb1ec0e6dc75bb0bd9e4e94121f0de30 100644 (file)
--- a/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h
+++ b/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h
@@ -27,7 +27,7 @@
 
 #if ENABLE(DATA_DETECTION)
 
-#include "DataDetectorsCoreSPI.h"
+#include <pal/spi/cocoa/DataDetectorsCoreSPI.h>
 #include <wtf/SoftLinking.h>
 
 #if PLATFORM(IOS)

diff --git a/Source/WebCore/platform/cocoa/MIMETypeRegistryCocoa.mm b/Source/WebCore/platform/cocoa/MIMETypeRegistryCocoa.mm
index 35737041d3d515b2a276827756ebfaefea524fae..a7306b52ffb9e8aeac98e7738f38b848e745303d 100644 (file)
--- a/Source/WebCore/platform/cocoa/MIMETypeRegistryCocoa.mm
+++ b/Source/WebCore/platform/cocoa/MIMETypeRegistryCocoa.mm
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "MIMETypeRegistry.h"
 
-#include "NSURLFileTypeMappingsSPI.h"
+#include <pal/spi/cocoa/NSURLFileTypeMappingsSPI.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm b/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm
index 0aa97cfde2876d95b1227b9767a8e720e3738049..7d0d25ee29d1c6a30b2344fa25412f5f359874c0 100644 (file)
--- a/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm
+++ b/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm
@@ -30,13 +30,13 @@
 
 #import "ContentFilterUnblockHandler.h"
 #import "Logging.h"
-#import "NEFilterSourceSPI.h"
 #import "ResourceRequest.h"
 #import "ResourceResponse.h"
 #import "RuntimeApplicationChecks.h"
 #import "SharedBuffer.h"
 #import "URL.h"
 #import <objc/runtime.h>
+#import <pal/spi/cocoa/NEFilterSourceSPI.h>
 #import <wtf/SoftLinking.h>
 
 SOFT_LINK_FRAMEWORK_OPTIONAL(NetworkExtension);

diff --git a/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm b/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm
index 467de0f4f3b9d30ddae0e78b1ed2cf7e5f087401..29ac6de1ad5ddcb104ee53a975fd0aa354bb66bd 100644 (file)
--- a/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm
+++ b/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm
@@ -32,8 +32,8 @@
 #import "Logging.h"
 #import "ResourceResponse.h"
 #import "SharedBuffer.h"
-#import "WebFilterEvaluatorSPI.h"
 #import <objc/runtime.h>
+#import <pal/spi/cocoa/WebFilterEvaluatorSPI.h>
 #import <wtf/SoftLinking.h>
 
 SOFT_LINK_PRIVATE_FRAMEWORK(WebContentAnalysis);

diff --git a/Source/WebCore/platform/cocoa/SleepDisablerCocoa.cpp b/Source/WebCore/platform/cocoa/SleepDisablerCocoa.cpp
index e89eed8271f2d7cc297f899b8913e57a695b2a8d..0f3993e762512ddf3e5bac27f28b76f5a1c132e0 100644 (file)
--- a/Source/WebCore/platform/cocoa/SleepDisablerCocoa.cpp
+++ b/Source/WebCore/platform/cocoa/SleepDisablerCocoa.cpp
@@ -28,7 +28,7 @@
 
 #if PLATFORM(COCOA)
 
-#include "IOPMLibSPI.h"
+#include <pal/spi/cocoa/IOPMLibSPI.h>
 #include <wtf/RetainPtr.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/platform/graphics/Font.cpp b/Source/WebCore/platform/graphics/Font.cpp
index 71da0e04baddf26594ce000c6171f43a89d6c0d3..70cb35fc1cc28b44a03d13f3617e4e5a959c8050 100644 (file)
--- a/Source/WebCore/platform/graphics/Font.cpp
+++ b/Source/WebCore/platform/graphics/Font.cpp
@@ -31,7 +31,7 @@
 #include "Font.h"
 
 #if PLATFORM(COCOA)
-#include "CoreTextSPI.h"
+#include <pal/spi/cocoa/CoreTextSPI.h>
 #endif
 #include "FontCache.h"
 #include "FontCascade.h"

diff --git a/Source/WebCore/platform/graphics/Font.h b/Source/WebCore/platform/graphics/Font.h
index a2baa79f1edbbe16df0e85a5aa5081ae93481313..a8492ca2471a0f571c3d8f9ee6125ef01c6a7699 100644 (file)
--- a/Source/WebCore/platform/graphics/Font.h
+++ b/Source/WebCore/platform/graphics/Font.h
@@ -52,7 +52,7 @@
 #endif
 
 #if USE(CG)
-#include "CoreGraphicsSPI.h"
+#include <pal/spi/cg/CoreGraphicsSPI.h>
 #endif
 
 #if USE(DIRECT2D)

diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/AVAssetTrackUtilities.mm b/Source/WebCore/platform/graphics/avfoundation/objc/AVAssetTrackUtilities.mm
index aa33d67c80bdf879b32272e16f4ef18643caea0c..0f344a01b70da7e10c08e6c63cffc776f59f2dc1 100644 (file)
--- a/Source/WebCore/platform/graphics/avfoundation/objc/AVAssetTrackUtilities.mm
+++ b/Source/WebCore/platform/graphics/avfoundation/objc/AVAssetTrackUtilities.mm
@@ -29,8 +29,8 @@
 #if ENABLE(VIDEO) && USE(AVFOUNDATION)
 
 #import "FourCC.h"
-#import "IOPSLibSPI.h"
 #import <AVFoundation/AVAssetTrack.h>
+#import <pal/spi/cocoa/IOPSLibSPI.h>
 
 #import "CoreMediaSoftLink.h"
 #import "VideoToolboxSoftLink.h"

diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm
index d4a06fafa79b9dc2ce4753c01c1aa2dc25e2eef6..11a836e4c9f796002f32ddd7045f7a1fc3b0d2e3 100644 (file)
--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm
+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm
@@ -30,10 +30,10 @@
 
 #import "Logging.h"
 #import <WebCore/AVFoundationSPI.h>
-#import <WebCore/AVKitSPI.h>
 #import <WebCore/FloatRect.h>
 #import <WebCore/MediaPlaybackTargetMac.h>
 #import <objc/runtime.h>
+#import <pal/spi/cocoa/AVKitSPI.h>
 #import <wtf/MainThread.h>
 #import <wtf/SoftLinking.h>
 

diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
index c9fef84e424b052cf3fcf9e7a97064108b9373b5..13a45a27ea30a47dfdc24a3cd0309c1720abd0c2 100644 (file)
--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
@@ -39,7 +39,6 @@
 #import "Cookie.h"
 #import "Extensions3D.h"
 #import "FloatConversion.h"
-#import "FloatConversion.h"
 #import "GraphicsContext.h"
 #import "GraphicsContext3D.h"
 #import "GraphicsContextCG.h"
@@ -54,7 +53,6 @@
 #import "OutOfBandTextTrackPrivateAVF.h"
 #import "PixelBufferConformerCV.h"
 #import "PlatformTimeRanges.h"
-#import "QuartzCoreSPI.h"
 #import "SecurityOrigin.h"
 #import "SerializedPlatformRepresentationMac.h"
 #import "Settings.h"
@@ -71,6 +69,7 @@
 #import <functional>
 #import <map>
 #import <objc/runtime.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <runtime/DataView.h>
 #import <runtime/JSCInlines.h>
 #import <runtime/TypedArrayInlines.h>
@@ -118,7 +117,7 @@
 #endif
 
 #if USE(CFURLCONNECTION)
-#include "CFNSURLConnectionSPI.h"
+#include <pal/spi/cocoa/CFNSURLConnectionSPI.h>
 #endif
 
 #import "CoreVideoSoftLink.h"

diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManager.mm b/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManager.mm
index ae9776e55e57bd4af849bbbb66410a1d150d4bef..bce2194ec8f7fd8e96a6838756e52d7bc991b65e 100644 (file)
--- a/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManager.mm
+++ b/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManager.mm
@@ -29,10 +29,10 @@
 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
 
 #import "Color.h"
-#import "QuartzCoreSPI.h"
 #import "WebCoreCALayerExtras.h"
 #import <mach/mach_init.h>
 #import <mach/mach_port.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/BlockPtr.h>
 
 @interface WebVideoContainerLayer : CALayer

diff --git a/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.mm b/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.mm
index 345ed9645809f60d1536281be7902e21f08587de..96fd67183c98b08de403d3de23dd85a60699a6a1 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.mm
+++ b/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.mm
@@ -28,9 +28,9 @@
 
 #import "FloatConversion.h"
 #import "PlatformCAFilters.h"
-#import "QuartzCoreSPI.h"
 #import "TimingFunction.h"
 #import <QuartzCore/QuartzCore.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/text/WTFString.h>
 
 using namespace WebCore;

diff --git a/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm b/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm
index 605677dec10c2ab0d1c3cebecfdbd6710e587ea7..7891ce6aefd1252dab3db0dfdffae943cc3dbdbe 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm
+++ b/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm
@@ -29,8 +29,8 @@
 #import "FloatConversion.h"
 #import "LengthFunctions.h" // This is a layering violation.
 #import "PlatformCALayerCocoa.h"
-#import "QuartzCoreSPI.h"
 #import <QuartzCore/QuartzCore.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 
 using namespace WebCore;

diff --git a/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm b/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
index 5c9b42ed1528ca4e3efa7a9428c90002498b0a44..b95128fc8b47958bd1b6d2e7bd7683eadf00965b 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
+++ b/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
@@ -32,13 +32,13 @@
 #import "LengthFunctions.h"
 #import "PlatformCAAnimationCocoa.h"
 #import "PlatformCAFilters.h"
-#import "QuartzCoreSPI.h"
 #import "ScrollbarThemeMac.h"
 #import "TileController.h"
 #import "TiledBacking.h"
 #import "WebActionDisablingCALayerDelegate.h"
 #import "WebCoreCALayerExtras.h"
 #import "WebGLLayer.h"
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/SoftLinking.h>
 #if ENABLE(WEBGPU)
 #import "WebGPULayer.h"

diff --git a/Source/WebCore/platform/graphics/cg/ColorCG.cpp b/Source/WebCore/platform/graphics/cg/ColorCG.cpp
index 4d834f7f9bfb1ebf9a63f69a903e91a2e26c9a3a..617a32fe545ebafa13de4cabf11dbbf069deb6bb 100644 (file)
--- a/Source/WebCore/platform/graphics/cg/ColorCG.cpp
+++ b/Source/WebCore/platform/graphics/cg/ColorCG.cpp
@@ -35,7 +35,7 @@
 #if !PLATFORM(IOS)
 #include <ApplicationServices/ApplicationServices.h>
 #else
-#include "CoreGraphicsSPI.h"
+#include <pal/spi/cg/CoreGraphicsSPI.h>
 #include <wtf/StdLibExtras.h>
 #endif // !PLATFORM(IOS)
 

diff --git a/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp b/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
index 909783d1abd8650b834e4d34e4a86bc9e337c46d..d58839ae58bb510d507d465b06192e020bad5abd 100644 (file)
--- a/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
+++ b/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
@@ -30,7 +30,6 @@
 #if USE(CG)
 
 #include "AffineTransform.h"
-#include "CoreGraphicsSPI.h"
 #include "DisplayListRecorder.h"
 #include "FloatConversion.h"
 #include "GraphicsContextPlatformPrivateCG.h"
@@ -43,6 +42,7 @@
 #include "SubimageCacheWithTimer.h"
 #include "Timer.h"
 #include "URL.h"
+#include <pal/spi/cg/CoreGraphicsSPI.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 #include <wtf/RetainPtr.h>

diff --git a/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp b/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
index c7dd8146000901358721dfeba66416ac175ace80..71eb83dfaa60687ff6ead8ffb46b227e48cb44d9 100644 (file)
--- a/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
+++ b/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
@@ -52,7 +52,7 @@
 
 #if USE(IOSURFACE_CANVAS_BACKING_STORE)
 #include "IOSurface.h"
-#include "IOSurfaceSPI.h"
+#include <pal/spi/cocoa/IOSurfaceSPI.h>
 #endif
 
 // CA uses ARGB32 for textures and ARGB32 -> ARGB32 resampling is optimized.

diff --git a/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp b/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp
index 2d383dcc67baa74b5d081d0e4cc3993a97394f9e..449c3c9e465791f2b64359d5032a99db255b187b 100644 (file)
--- a/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp
+++ b/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp
@@ -42,8 +42,8 @@
 
 #if USE(IOSURFACE_CANVAS_BACKING_STORE)
 #include "IOSurface.h"
-#include "IOSurfaceSPI.h"
 #include <dispatch/dispatch.h>
+#include <pal/spi/cocoa/IOSurfaceSPI.h>
 #endif
 
 // CA uses ARGB32 for textures and ARGB32 -> ARGB32 resampling is optimized.

diff --git a/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp b/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp
index 767441e0a2b7767c8146b7b084ff801546643561..b06463f8956342a471aa5a4d6881126ef859838d 100644 (file)
--- a/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp
+++ b/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp
@@ -28,7 +28,6 @@
 
 #if USE(CG)
 
-#include "ImageIOSPI.h"
 #include "ImageOrientation.h"
 #include "ImageSourceCG.h"
 #include "IntPoint.h"
@@ -36,12 +35,13 @@
 #include "Logging.h"
 #include "SharedBuffer.h"
 #include "UTIRegistry.h"
+#include <pal/spi/cg/ImageIOSPI.h>
 
 #if !PLATFORM(IOS)
 #include <ApplicationServices/ApplicationServices.h>
 #else
-#include "CoreGraphicsSPI.h"
 #include <ImageIO/ImageIO.h>
+#include <pal/spi/cg/CoreGraphicsSPI.h>
 #endif
 
 namespace WebCore {

diff --git a/Source/WebCore/platform/graphics/cg/NativeImageCG.cpp b/Source/WebCore/platform/graphics/cg/NativeImageCG.cpp
index 1448e5cb8981b07f1dd19cd12d0a0fc79ad61b96..b08026bd1d77d2e2c5e4803832f65a1fd4fc68c9 100644 (file)
--- a/Source/WebCore/platform/graphics/cg/NativeImageCG.cpp
+++ b/Source/WebCore/platform/graphics/cg/NativeImageCG.cpp
@@ -29,12 +29,12 @@
 #if USE(CG)
 
 #include "Color.h"
-#include "CoreGraphicsSPI.h"
 #include "FloatRect.h"
 #include "GeometryUtilities.h"
 #include "GraphicsContextCG.h"
 #include "IntSize.h"
 #include "SubimageCacheWithTimer.h"
+#include <pal/spi/cg/CoreGraphicsSPI.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp b/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
index 9f0f31244a1ac3a8db1bb9318bc690d863c85378..9d03f5f4a561b842f1c0426a4353b7fa86d79a38 100644 (file)
--- a/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
+++ b/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
@@ -26,8 +26,8 @@
 #include "config.h"
 #include "FontCache.h"
 
-#include "CoreTextSPI.h"
 #include "Font.h"
+#include <pal/spi/cocoa/CoreTextSPI.h>
 
 #include <CoreText/SFNTLayoutTypes.h>
 

diff --git a/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm b/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm
index 09a21a1e647679ea79b8a68de5662050353a9b06..fa83778ca2fec0b564d47a6ea27f91b765268e61 100644 (file)
--- a/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm
+++ b/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm
@@ -24,8 +24,6 @@
 #import "FontCascade.h"
 
 #import "ComplexTextController.h"
-#import "CoreGraphicsSPI.h"
-#import "CoreTextSPI.h"
 #import "DashArray.h"
 #import "Font.h"
 #import "GlyphBuffer.h"
@@ -33,6 +31,8 @@
 #import "LayoutRect.h"
 #import "Logging.h"
 #import "WebCoreSystemInterface.h"
+#import <pal/spi/cg/CoreGraphicsSPI.h>
+#import <pal/spi/cocoa/CoreTextSPI.h>
 #if USE(APPKIT)
 #import <AppKit/AppKit.h>
 #endif

diff --git a/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm b/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm
index 7a1f0f39d558db897034defb193757a714af6ecf..9feb2d938d71fc52fd99feaf272a14286039ced8 100644 (file)
--- a/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm
+++ b/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm
@@ -28,8 +28,6 @@
 #import "Font.h"
 
 #import "Color.h"
-#import "CoreGraphicsSPI.h"
-#import "CoreTextSPI.h"
 #import "FloatRect.h"
 #import "FontCache.h"
 #import "FontCascade.h"
@@ -38,6 +36,8 @@
 #import "SharedBuffer.h"
 #import "WebCoreSystemInterface.h"
 #import <float.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
+#import <pal/spi/cocoa/CoreTextSPI.h>
 #import <unicode/uchar.h>
 #import <wtf/Assertions.h>
 #import <wtf/RetainPtr.h>

diff --git a/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp b/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp
index 4e0a9b9728c6085cbef16b48ae6e860a72b04ab9..cb9ff816a40d08581c2f8db97ef61fa7bad14d39 100644 (file)
--- a/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp
+++ b/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp
@@ -26,9 +26,9 @@
 #include "config.h"
 #include "FontDescription.h"
 
-#include "CoreTextSPI.h"
 #include "FontCache.h"
 #include "FontFamilySpecificationCoreText.h"
+#include <pal/spi/cocoa/CoreTextSPI.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashTraits.h>
 #include <wtf/text/AtomicString.h>

diff --git a/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm b/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
index 504258e4233a59cfce5960e92bf9b20647864963..f78c41ab1bef71713fe8e922762c35ab7bae3266 100644 (file)
--- a/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
+++ b/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
@@ -24,14 +24,14 @@
 #import "config.h"
 #import "FontPlatformData.h"
 
-#import "CoreTextSPI.h"
 #import "SharedBuffer.h"
 #import "WebCoreSystemInterface.h"
+#import <pal/spi/cocoa/CoreTextSPI.h>
 #import <wtf/text/WTFString.h>
 
 #if PLATFORM(IOS)
-#import "CoreGraphicsSPI.h"
 #import <CoreText/CoreText.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
 #endif
 
 namespace WebCore {

diff --git a/Source/WebCore/platform/graphics/cocoa/IOSurface.mm b/Source/WebCore/platform/graphics/cocoa/IOSurface.mm
index 09fb920494122eaf0868063b23e92a1698c5e692..297ff780aa0f1d39fc03898263d7037b00dbf412 100644 (file)
--- a/Source/WebCore/platform/graphics/cocoa/IOSurface.mm
+++ b/Source/WebCore/platform/graphics/cocoa/IOSurface.mm
@@ -28,14 +28,14 @@
 
 #if USE(IOSURFACE)
 
-#import "CoreGraphicsSPI.h"
 #import "GraphicsContextCG.h"
 #import "IOSurfacePool.h"
-#import "IOSurfaceSPI.h"
 #import "ImageBuffer.h"
 #import "ImageBufferDataCG.h"
 #import "Logging.h"
 #import "MachSendRight.h"
+#import <pal/spi/cg/CoreGraphicsSPI.h>
+#import <pal/spi/cocoa/IOSurfaceSPI.h>
 #import <wtf/Assertions.h>
 #import <wtf/MathExtras.h>
 #import <wtf/text/TextStream.h>

diff --git a/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm b/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm
index f1c9d9f915da45b972b52dbf9c8a301451473560..679e5acae431cf6e7620471ca58c72fe7b3da575 100644 (file)
--- a/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm
+++ b/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm
@@ -32,13 +32,13 @@
 #include "GraphicsContextCG.h"
 #include "IntRect.h"
 
-#import "QuartzCoreSPI.h"
-
 #if PLATFORM(IOS)
 #include "WebCoreThread.h"
 #include "WebCoreThreadRun.h"
 #endif
 
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
+
 using namespace WebCore;
 
 @interface WebCoreTextTrackRepresentationCocoaHelper : NSObject <CALayerDelegate> {

diff --git a/Source/WebCore/platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h b/Source/WebCore/platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h
index 14677d08ebc2eff2fe6f378a79cb16297af8aa11..605a7f0a35e805a08fad303eb63957c1213d033b 100644 (file)
--- a/Source/WebCore/platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h
+++ b/Source/WebCore/platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h
@@ -26,7 +26,7 @@
 #ifndef WebActionDisablingCALayerDelegate_h
 #define WebActionDisablingCALayerDelegate_h
 
-#import "QuartzCoreSPI.h"
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 
 WEBCORE_EXPORT @interface WebActionDisablingCALayerDelegate : NSObject <CALayerDelegate>
 

diff --git a/Source/WebCore/platform/graphics/ios/FontAntialiasingStateSaver.h b/Source/WebCore/platform/graphics/ios/FontAntialiasingStateSaver.h
index 45dab2f96b39a798b5f8e75b6f45ef4aee058d86..47b96e2f8227d7d016446d4ba2a7bbb6b78f9a54 100644 (file)
--- a/Source/WebCore/platform/graphics/ios/FontAntialiasingStateSaver.h
+++ b/Source/WebCore/platform/graphics/ios/FontAntialiasingStateSaver.h
@@ -28,7 +28,7 @@
 
 #if PLATFORM(IOS)
 
-#import "CoreGraphicsSPI.h"
+#import <pal/spi/cg/CoreGraphicsSPI.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm b/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
index eebed1393521752e1110aea5ca7a85ea936fad56..e93a02ca748722924a278a212eb165d15405e00c 100644 (file)
--- a/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
+++ b/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
@@ -29,10 +29,10 @@
 #import "config.h"
 #import "FontCache.h"
 
-#import "CoreGraphicsSPI.h"
-#import "CoreTextSPI.h"
 #import "FontCascade.h"
 #import "RenderThemeIOS.h"
+#import <pal/spi/cg/CoreGraphicsSPI.h>
+#import <pal/spi/cocoa/CoreTextSPI.h>
 #import <wtf/HashSet.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/RetainPtr.h>

diff --git a/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm b/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm
index 636daa18fccc4ea54a563319fe984691c4399413..7ff0bbd5b5b0b8cf60ab85089be71cdcfd9d3c90 100644 (file)
--- a/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm
+++ b/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm
@@ -25,11 +25,11 @@
 #include "config.h"
 #include "ComplexTextController.h"
 
-#include "CoreTextSPI.h"
 #include "FontCache.h"
 #include "FontCascade.h"
 #include "TextRun.h"
 #include "WebCoreSystemInterface.h"
+#include <pal/spi/cocoa/CoreTextSPI.h>
 #include <wtf/SoftLinking.h>
 #include <wtf/WeakPtr.h>
 

diff --git a/Source/WebCore/platform/graphics/mac/FontCacheMac.mm b/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
index daa0a88537c12fc01cd0a0642d85f6e7f8e04a0f..ddf0d3ad0f0e07716a84a55f31e78e6e011b6f90 100644 (file)
--- a/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
+++ b/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
@@ -30,11 +30,11 @@
 #import "config.h"
 #import "FontCache.h"
 
-#import "CoreGraphicsSPI.h"
-#import "CoreTextSPI.h"
 #import "Font.h"
 #import "FontCascade.h"
 #import "FontPlatformData.h"
+#import <pal/spi/cg/CoreGraphicsSPI.h>
+#import <pal/spi/cocoa/CoreTextSPI.h>
 
 #if PLATFORM(MAC)
 #import "NSFontSPI.h"

diff --git a/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp b/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp
index bbff11b696f0a6bfedcd7ced03832b30f1165442..b1daa6959c99d111259ac39eb7d38416cb9dfe30 100644 (file)
--- a/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp
+++ b/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp
@@ -29,11 +29,11 @@
 #include "config.h"
 #include "GlyphPage.h"
 
-#include "CoreGraphicsSPI.h"
-#include "CoreTextSPI.h"
 #include "Font.h"
 #include "FontCascade.h"
 #include "WebCoreSystemInterface.h"
+#include <pal/spi/cg/CoreGraphicsSPI.h>
+#include <pal/spi/cocoa/CoreTextSPI.h>
 #if !PLATFORM(IOS)
 #include <ApplicationServices/ApplicationServices.h>
 #endif

diff --git a/Source/WebCore/platform/graphics/win/FontCacheWin.cpp b/Source/WebCore/platform/graphics/win/FontCacheWin.cpp
index acfe79e6ab4267a5e5b26715bb730e7d68aced38..cea9f6a49582566f89930c41ddc61209a4782a46 100644 (file)
--- a/Source/WebCore/platform/graphics/win/FontCacheWin.cpp
+++ b/Source/WebCore/platform/graphics/win/FontCacheWin.cpp
@@ -42,9 +42,9 @@
 #include <wtf/win/GDIObject.h>
 
 #if USE(CG)
-#include "CoreGraphicsSPI.h"
 #include <ApplicationServices/ApplicationServices.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
+#include <pal/spi/cg/CoreGraphicsSPI.h>
 #endif
 
 #if USE(DIRECT2D)

diff --git a/Source/WebCore/platform/ios/LegacyTileCache.mm b/Source/WebCore/platform/ios/LegacyTileCache.mm
index ce2284b2e1a3830d5412f206bc8ad515d53e846c..08c4d62c2d2f91da40c1c3c9b2d78bfb541b8b42 100644 (file)
--- a/Source/WebCore/platform/ios/LegacyTileCache.mm
+++ b/Source/WebCore/platform/ios/LegacyTileCache.mm
@@ -28,19 +28,19 @@
 
 #if PLATFORM(IOS)
 
-#include <CoreText/CoreText.h>
 #include "FontAntialiasingStateSaver.h"
 #include "LegacyTileGrid.h"
 #include "LegacyTileGridTile.h"
 #include "LegacyTileLayer.h"
 #include "LegacyTileLayerPool.h"
 #include "Logging.h"
-#include "QuartzCoreSPI.h"
 #include "SystemMemory.h"
 #include "WAKWindow.h"
 #include "WKGraphics.h"
 #include "WebCoreSystemInterface.h"
 #include "WebCoreThreadRun.h"
+#include <CoreText/CoreText.h>
+#include <pal/spi/cocoa/QuartzCoreSPI.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/MemoryPressureHandler.h>
 #include <wtf/RAMSize.h>

diff --git a/Source/WebCore/platform/ios/LegacyTileGrid.mm b/Source/WebCore/platform/ios/LegacyTileGrid.mm
index 9e60d63df67d06fd6aa59bc0fc6ce14d0411c6d7..11ea51b69d167807cddbc2d2c272c1ad4695c55a 100644 (file)
--- a/Source/WebCore/platform/ios/LegacyTileGrid.mm
+++ b/Source/WebCore/platform/ios/LegacyTileGrid.mm
@@ -28,15 +28,15 @@
 
 #if PLATFORM(IOS)
 
-#include "CoreGraphicsSPI.h"
 #include "LegacyTileGridTile.h"
 #include "LegacyTileLayer.h"
 #include "LegacyTileLayerPool.h"
-#include "QuartzCoreSPI.h"
 #include "SystemMemory.h"
 #include "WAKWindow.h"
 #include <algorithm>
 #include <functional>
+#include <pal/spi/cg/CoreGraphicsSPI.h>
+#include <pal/spi/cocoa/QuartzCoreSPI.h>
 #include <wtf/MemoryPressureHandler.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/platform/ios/LegacyTileGridTile.mm b/Source/WebCore/platform/ios/LegacyTileGridTile.mm
index 3d61d8b34166bafe3083ccad886fb7ad34a85fa2..49edbd1edafe161d9fa23c6aff1a040df670ca19 100644 (file)
--- a/Source/WebCore/platform/ios/LegacyTileGridTile.mm
+++ b/Source/WebCore/platform/ios/LegacyTileGridTile.mm
@@ -34,10 +34,10 @@
 #include "LegacyTileLayer.h"
 #include "LegacyTileLayerPool.h"
 #include "PlatformScreen.h"
-#include "QuartzCoreSPI.h"
 #include "WAKWindow.h"
 #include <algorithm>
 #include <functional>
+#include <pal/spi/cocoa/QuartzCoreSPI.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm b/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm
index 95ba905a7019496577317b10d530027fc1c51512..fa1e0d5101db33a9f82e8601e68f98c508db9e2f 100644 (file)
--- a/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm
+++ b/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm
@@ -30,13 +30,13 @@
 #if PLATFORM(IOS)
 #if HAVE(AVKIT)
 
-#import "AVKitSPI.h"
 #import "Logging.h"
 #import "MediaSelectionOption.h"
 #import "PlaybackSessionModel.h"
 #import "TimeRanges.h"
 #import "WebAVPlayerController.h"
 #import <AVFoundation/AVTime.h>
+#import <pal/spi/cocoa/AVKitSPI.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/text/CString.h>
 #import <wtf/text/WTFString.h>

diff --git a/Source/WebCore/platform/ios/QuickLook.mm b/Source/WebCore/platform/ios/QuickLook.mm
index 951da310719a7dd9e454e4261ac9a3479d7c2e5f..7b7774e9e9fce4890aa08a9c2b37bde62c802a68 100644 (file)
--- a/Source/WebCore/platform/ios/QuickLook.mm
+++ b/Source/WebCore/platform/ios/QuickLook.mm
@@ -29,10 +29,10 @@
 #if USE(QUICK_LOOK)
 
 #import "FileSystemIOS.h"
-#import "NSFileManagerSPI.h"
 #import "PreviewConverter.h"
 #import "ResourceRequest.h"
 #import "SchemeRegistry.h"
+#import <pal/spi/cocoa/NSFileManagerSPI.h>
 #import <wtf/Lock.h>
 #import <wtf/NeverDestroyed.h>
 

diff --git a/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm b/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm
index 1bb85209ce678a0987906f4581d83ff477bc6a88..ce62973aed707c0b6dc807eb28131fa75b919f74 100644 (file)
--- a/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm
+++ b/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm
@@ -30,7 +30,6 @@
 
 #if HAVE(AVKIT)
 
-#import "AVKitSPI.h"
 #import "GeometryUtilities.h"
 #import "Logging.h"
 #import "PlaybackSessionInterfaceAVKit.h"
@@ -44,6 +43,7 @@
 #import <UIKit/UIKit.h>
 #import <objc/message.h>
 #import <objc/runtime.h>
+#import <pal/spi/cocoa/AVKitSPI.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/text/CString.h>
 #import <wtf/text/WTFString.h>

diff --git a/Source/WebCore/platform/ios/WebAVPlayerController.h b/Source/WebCore/platform/ios/WebAVPlayerController.h
index 1b10fba0d4219f091f73b8c7970604bb5d20c0ee..1e03205ad032fdcf8ef696d20b82cfea17cac546 100644 (file)
--- a/Source/WebCore/platform/ios/WebAVPlayerController.h
+++ b/Source/WebCore/platform/ios/WebAVPlayerController.h
@@ -25,7 +25,7 @@
 
 #if PLATFORM(IOS) && HAVE(AVKIT)
 
-#import "AVKitSPI.h"
+#import <pal/spi/cocoa/AVKitSPI.h>
 
 namespace WebCore {
 class PlaybackSessionModel;

diff --git a/Source/WebCore/platform/ios/WebAVPlayerController.mm b/Source/WebCore/platform/ios/WebAVPlayerController.mm
index 850306ac15ed0a18bc8f17b4f2b7a64c10ded321..df523d49e0705c2ebb5d860f6f433b4fce62efd9 100644 (file)
--- a/Source/WebCore/platform/ios/WebAVPlayerController.mm
+++ b/Source/WebCore/platform/ios/WebAVPlayerController.mm
@@ -29,12 +29,12 @@
 
 #if PLATFORM(IOS) && HAVE(AVKIT)
 
-#import "AVKitSPI.h"
 #import "Logging.h"
 #import "PlaybackSessionInterfaceAVKit.h"
 #import "PlaybackSessionModel.h"
 #import "TimeRanges.h"
 #import <AVFoundation/AVTime.h>
+#import <pal/spi/cocoa/AVKitSPI.h>
 #import <wtf/text/CString.h>
 #import <wtf/text/WTFString.h>
 

diff --git a/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm b/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
index 2684dddb2ff29177ad94b77ee02a41776e2d75df..1b0b4ba3d1f08f5128c8c42ecbf1fbaf5ffb92af 100644 (file)
--- a/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
+++ b/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
@@ -33,7 +33,6 @@
 #import "MediaSelectionOption.h"
 #import "PlaybackSessionInterfaceAVKit.h"
 #import "PlaybackSessionModelMediaElement.h"
-#import "QuartzCoreSPI.h"
 #import "TimeRanges.h"
 #import "VideoFullscreenChangeObserver.h"
 #import "VideoFullscreenInterfaceAVKit.h"
@@ -44,6 +43,7 @@
 #import <WebCore/HTMLVideoElement.h>
 #import <WebCore/RenderVideo.h>
 #import <WebCore/WebCoreThreadRun.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/SoftLinking.h>
 
 SOFT_LINK_FRAMEWORK(UIKit)

diff --git a/Source/WebCore/platform/ios/wak/WKGraphics.mm b/Source/WebCore/platform/ios/wak/WKGraphics.mm
index dea5e5070cfdf819f14896efa44bdde4e43ecb38..68eb6dee7b6c72cdde79cbac91f6e25f701a4608 100644 (file)
--- a/Source/WebCore/platform/ios/wak/WKGraphics.mm
+++ b/Source/WebCore/platform/ios/wak/WKGraphics.mm
@@ -29,11 +29,11 @@
 
 #if PLATFORM(IOS)
 
-#import "CoreGraphicsSPI.h"
 #import "FontCascade.h"
 #import "PlatformScreen.h"
 #import "WebCoreThreadInternal.h"
 #import <ImageIO/ImageIO.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <wtf/StdLibExtras.h>
 
 using namespace WebCore;

diff --git a/Source/WebCore/platform/mac/DragImageMac.mm b/Source/WebCore/platform/mac/DragImageMac.mm
index 4db3b55cba2d1ec814ebb04828844932ea87dce4..d400263639d469ec847fa2c350f0f0ec785bf58c 100644 (file)
--- a/Source/WebCore/platform/mac/DragImageMac.mm
+++ b/Source/WebCore/platform/mac/DragImageMac.mm
@@ -29,8 +29,6 @@
 #if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
 
 #import "BitmapImage.h"
-#import "CoreGraphicsSPI.h"
-#import "CoreTextSPI.h"
 #import "Element.h"
 #import "FloatRoundedRect.h"
 #import "FontCascade.h"
@@ -38,11 +36,13 @@
 #import "FontSelector.h"
 #import "GraphicsContext.h"
 #import "Image.h"
-#import "LinkPresentationSPI.h"
 #import "StringTruncator.h"
 #import "TextIndicator.h"
 #import "TextRun.h"
 #import "URL.h"
+#import <pal/spi/cg/CoreGraphicsSPI.h>
+#import <pal/spi/cocoa/CoreTextSPI.h>
+#import <pal/spi/cocoa/LinkPresentationSPI.h>
 #import <wtf/SoftLinking.h>
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300

diff --git a/Source/WebCore/platform/mac/PlatformScreenMac.mm b/Source/WebCore/platform/mac/PlatformScreenMac.mm
index 5779471a90f4fa1fcf2eba0ec5e3bf4b6d96125c..0f9172ae5945939f1844fcd191ca56dffd882859 100644 (file)
--- a/Source/WebCore/platform/mac/PlatformScreenMac.mm
+++ b/Source/WebCore/platform/mac/PlatformScreenMac.mm
@@ -26,11 +26,11 @@
 #import "config.h"
 #import "PlatformScreen.h"
 
-#import "CoreGraphicsSPI.h"
 #import "FloatRect.h"
 #import "FrameView.h"
 #import "HostWindow.h"
 #import <ColorSync/ColorSync.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
 
 extern "C" {
 bool CGDisplayUsesInvertedPolarity(void);

diff --git a/Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.mm b/Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.mm
index 59ef223069a9cee9f112513bbfef0b12c67b24e3..2e72affebc328613a27f510aea8cdc846f196f4e 100644 (file)
--- a/Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.mm
+++ b/Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.mm
@@ -28,7 +28,6 @@
 
 #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
 
-#import "AVKitSPI.h"
 #import "IntRect.h"
 #import "MediaSelectionOption.h"
 #import "MediaTimeAVFoundation.h"
@@ -36,6 +35,7 @@
 #import "TimeRanges.h"
 #import "WebPlaybackControlsManager.h"
 #import <AVFoundation/AVTime.h>
+#import <pal/spi/cocoa/AVKitSPI.h>
 
 #import "CoreMediaSoftLink.h"
 

diff --git a/Source/WebCore/platform/mac/ThemeMac.mm b/Source/WebCore/platform/mac/ThemeMac.mm
index d8c00330da5a87dd3561c34fe6e3937f1b2e5ac0..90f1041eff7f0c647d6f8391c027f53d1ab44714 100644 (file)
--- a/Source/WebCore/platform/mac/ThemeMac.mm
+++ b/Source/WebCore/platform/mac/ThemeMac.mm
@@ -32,10 +32,10 @@
 #import "ImageBuffer.h"
 #import "LengthSize.h"
 #import "LocalCurrentGraphicsContext.h"
-#import "NSButtonCellSPI.h"
 #import "ScrollView.h"
 #import "WebCoreSystemInterface.h"
 #import <Carbon/Carbon.h>
+#import <pal/spi/cocoa/NSButtonCellSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/StdLibExtras.h>

diff --git a/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm b/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm
index 8140e39cbada14eec09bd92041b7eb489f24f6bc..9c273a85eadf6ed01fda3f9be67638b4b58fe782 100644 (file)
--- a/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm
+++ b/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm
@@ -28,7 +28,6 @@
 
 #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
 
-#import "AVKitSPI.h"
 #import "IntRect.h"
 #import "Logging.h"
 #import "MediaTimeAVFoundation.h"
@@ -39,6 +38,7 @@
 #import "VideoFullscreenModel.h"
 #import "WebPlaybackControlsManager.h"
 #import <AVFoundation/AVTime.h>
+#import <pal/spi/cocoa/AVKitSPI.h>
 
 #import "CoreMediaSoftLink.h"
 

diff --git a/Source/WebCore/platform/mac/WebPlaybackControlsManager.h b/Source/WebCore/platform/mac/WebPlaybackControlsManager.h
index 767f0128730001ab4d79fe603c122774af713e27..6ee406d0cae5792f6211613702f0b0e68e3497a2 100644 (file)
--- a/Source/WebCore/platform/mac/WebPlaybackControlsManager.h
+++ b/Source/WebCore/platform/mac/WebPlaybackControlsManager.h
@@ -25,7 +25,7 @@
 
 #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
 
-#import <WebCore/AVKitSPI.h>
+#import <pal/spi/cocoa/AVKitSPI.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/Vector.h>
 

diff --git a/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm b/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm
index ea48e8ff8b09beb9d2da3e741ac460a1723f2278..efb6e2b273c5835133e75b1626a95b0490c7799c 100644 (file)
--- a/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm
+++ b/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm
@@ -28,9 +28,9 @@
 #if ENABLE(VIDEO)
 
 #import "FloatConversion.h"
-#import <WebCore/CoreGraphicsSPI.h>
 #import <WebCore/HTMLVideoElement.h>
 #import <WebCoreSystemInterface.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
 
 using namespace WebCore;
 

diff --git a/Source/WebCore/platform/network/cocoa/CookieStorageObserver.mm b/Source/WebCore/platform/network/cocoa/CookieStorageObserver.mm
index 1f794098c3c386ebd1945d80fd835a375de28c70..f8418d7a86255646486a63d3834d914030174fda 100644 (file)
--- a/Source/WebCore/platform/network/cocoa/CookieStorageObserver.mm
+++ b/Source/WebCore/platform/network/cocoa/CookieStorageObserver.mm
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "CookieStorageObserver.h"
 
-#import "NSURLConnectionSPI.h"
+#import <pal/spi/cocoa/NSURLConnectionSPI.h>
 #import <wtf/MainThread.h>
 
 @interface WebNSHTTPCookieStorageInternal : NSObject {

diff --git a/Source/WebCore/platform/network/cocoa/NetworkLoadMetrics.mm b/Source/WebCore/platform/network/cocoa/NetworkLoadMetrics.mm
index dd471e1d314d85ff18164e0920f55fbe86f41e47..9aaec56c33bc53db28cecd31cb82b2a7d708aa2d 100644 (file)
--- a/Source/WebCore/platform/network/cocoa/NetworkLoadMetrics.mm
+++ b/Source/WebCore/platform/network/cocoa/NetworkLoadMetrics.mm
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "NetworkLoadMetrics.h"
 
-#import <WebCore/NSURLConnectionSPI.h>
+#import <pal/spi/cocoa/NSURLConnectionSPI.h>
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/network/mac/AuthenticationMac.mm b/Source/WebCore/platform/network/mac/AuthenticationMac.mm
index 73ebd863ada7ded6cdc9d85e508706b085ce15d8..8f9cbf6e647f1f7fdc8ef60f2705adbc33d0199f 100644 (file)
--- a/Source/WebCore/platform/network/mac/AuthenticationMac.mm
+++ b/Source/WebCore/platform/network/mac/AuthenticationMac.mm
@@ -33,7 +33,7 @@
 #import <Foundation/NSURLProtectionSpace.h>
 
 #if USE(CFURLCONNECTION)
-#import "CFNSURLConnectionSPI.h"
+#import <pal/spi/cocoa/CFNSURLConnectionSPI.h>
 #endif
 
 using namespace WebCore;

diff --git a/Source/WebCore/platform/network/mac/ResourceHandleMac.mm b/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
index ec0086260bbb479ff7a29a96dd638b233b9e11fe..0c35314ca20ae8dd48143f14019f96825594fe5d 100644 (file)
--- a/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
+++ b/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
@@ -37,7 +37,6 @@
 #import "HTTPHeaderNames.h"
 #import "Logging.h"
 #import "MIMETypeRegistry.h"
-#import "NSURLConnectionSPI.h"
 #import "NetworkStorageSession.h"
 #import "NetworkingContext.h"
 #import "ResourceError.h"
@@ -50,6 +49,7 @@
 #import "WebCoreSystemInterface.h"
 #import "WebCoreURLResponse.h"
 #import <pal/spi/cf/CFNetworkSPI.h>
+#import <pal/spi/cocoa/NSURLConnectionSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 #import <wtf/Ref.h>
 #import <wtf/SchedulePair.h>

diff --git a/Source/WebCore/platform/spi/ios/DataDetectorsUISPI.h b/Source/WebCore/platform/spi/ios/DataDetectorsUISPI.h
index d0a8ae9885b2c2e347893c7f3dd19d97e67fa4bd..6284ae3f05136718c346c14434c27765b675c6c8 100644 (file)
--- a/Source/WebCore/platform/spi/ios/DataDetectorsUISPI.h
+++ b/Source/WebCore/platform/spi/ios/DataDetectorsUISPI.h
@@ -35,7 +35,7 @@
 
 #else
 
-#import <WebCore/DataDetectorsCoreSPI.h>
+#import <pal/spi/cocoa/DataDetectorsCoreSPI.h>
 
 @interface DDAction : NSObject
 @end

diff --git a/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h b/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h
index 32bfcbf082da72925aa58ebc53b7affa28a83a58..3bcc461095beca6f4eedc852394fde00726642b6 100644 (file)
--- a/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h
+++ b/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h
@@ -29,7 +29,7 @@
 
 #if ENABLE(DATA_DETECTION)
 
-#import <WebCore/DataDetectorsCoreSPI.h>
+#import <pal/spi/cocoa/DataDetectorsCoreSPI.h>
 #import <wtf/SoftLinking.h>
 
 #if PLATFORM(MAC)

diff --git a/Source/WebCore/platform/spi/mac/NSViewSPI.h b/Source/WebCore/platform/spi/mac/NSViewSPI.h
index cd12837414f9d861df56117737981e3a5c692f7d..9eedb73c92349bbe5d8cd169bc0128416caf2fbb 100644 (file)
--- a/Source/WebCore/platform/spi/mac/NSViewSPI.h
+++ b/Source/WebCore/platform/spi/mac/NSViewSPI.h
@@ -25,7 +25,7 @@
 
 #if USE(APPKIT)
 
-#import "QuartzCoreSPI.h"
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 
 @interface NSView () <CALayerDelegate>
 @end

diff --git a/Source/WebCore/rendering/RenderThemeCocoa.mm b/Source/WebCore/rendering/RenderThemeCocoa.mm
index cbb8cd843bb023bc43eb608731439ca2967d1bd9..e3d729473a5111264219eb2cbb91f9fa0d94b3b0 100644 (file)
--- a/Source/WebCore/rendering/RenderThemeCocoa.mm
+++ b/Source/WebCore/rendering/RenderThemeCocoa.mm
@@ -28,10 +28,10 @@
 
 #if ENABLE(APPLE_PAY)
 
-#include "PassKitSPI.h"
 #include "RenderElement.h"
 #include "RenderStyle.h"
 #include "TranslateTransformOperation.h"
+#include <pal/spi/cocoa/PassKitSPI.h>
 #include <wtf/SoftLinking.h>
 
 #if PLATFORM(MAC)

diff --git a/Source/WebCore/rendering/RenderThemeIOS.mm b/Source/WebCore/rendering/RenderThemeIOS.mm
index d7c8bc50f331e6e60ee1d06d5f2366cdf5d87310..b8c95cf8316a1db9e6d75ab63a1cdfa456d66ceb 100644 (file)
--- a/Source/WebCore/rendering/RenderThemeIOS.mm
+++ b/Source/WebCore/rendering/RenderThemeIOS.mm
@@ -32,7 +32,6 @@
 #import "CSSPrimitiveValue.h"
 #import "CSSToLengthConversionData.h"
 #import "CSSValueKeywords.h"
-#import "CoreTextSPI.h"
 #import "DateComponents.h"
 #import "Document.h"
 #import "File.h"
@@ -70,6 +69,7 @@
 #import "WebCoreThreadRun.h"
 #import <CoreGraphics/CoreGraphics.h>
 #import <objc/runtime.h>
+#import <pal/spi/cocoa/CoreTextSPI.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/RefPtr.h>
 #import <wtf/SoftLinking.h>

diff --git a/Source/WebCore/rendering/RenderThemeMac.mm b/Source/WebCore/rendering/RenderThemeMac.mm
index d634165c823ceed8dbe2ac61e8610229d1243b00..5ebce803e9d9d70fa4291c3f2b137d9cceb7bb0d 100644 (file)
--- a/Source/WebCore/rendering/RenderThemeMac.mm
+++ b/Source/WebCore/rendering/RenderThemeMac.mm
@@ -26,7 +26,6 @@
 #import "CSSValueKeywords.h"
 #import "CSSValueList.h"
 #import "ColorMac.h"
-#import "CoreGraphicsSPI.h"
 #import "Document.h"
 #import "Element.h"
 #import "FileList.h"
@@ -48,7 +47,6 @@
 #import "LocalCurrentGraphicsContext.h"
 #import "LocalizedStrings.h"
 #import "MediaControlElements.h"
-#import "NSColorSPI.h"
 #import "NSSharingServicePickerSPI.h"
 #import "Page.h"
 #import "PaintInfo.h"
@@ -72,14 +70,15 @@
 #import "UserAgentScripts.h"
 #import "UserAgentStyleSheets.h"
 #import "WebCoreSystemInterface.h"
+#import <Carbon/Carbon.h>
+#import <Cocoa/Cocoa.h>
+#import <math.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
+#import <pal/spi/cocoa/NSColorSPI.h>
 #import <wtf/MathExtras.h>
 #import <wtf/RetainPtr.h>
-#import <wtf/RetainPtr.h>
 #import <wtf/StdLibExtras.h>
 #import <wtf/text/StringBuilder.h>
-#import <Carbon/Carbon.h>
-#import <Cocoa/Cocoa.h>
-#import <math.h>
 
 #if ENABLE(METER_ELEMENT)
 #import "RenderMeter.h"

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 2456822ceb8809029dbbbee18877c804f32cffd4..3040d4d542e7aa0f44f447166aced24dadb10ed9 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,48 @@
+2017-08-09  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [PAL] Move spi/cocoa and spi/cg directories into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175175
+
+        Reviewed by Myles C. Maxfield.
+
+        * NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm:
+        * NetworkProcess/Downloads/mac/DownloadMac.mm:
+        * Platform/cocoa/SharedMemoryCocoa.cpp:
+        * Platform/mac/LayerHostingContext.mm:
+        * Shared/Cocoa/DataDetectionResult.mm:
+        * Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:
+        * Shared/cf/CookieStorageUtilsCF.mm:
+        * Shared/ios/InteractionInformationAtPosition.mm:
+        * Shared/mac/HangDetectionDisablerMac.mm:
+        * Shared/mac/RemoteLayerBackingStore.mm:
+        * Shared/mac/RemoteLayerTreePropertyApplier.mm:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        * UIProcess/API/mac/WKView.mm:
+        * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h:
+        * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+        * UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm:
+        * UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
+        * UIProcess/Cocoa/WebViewImpl.h:
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        * UIProcess/ios/ViewGestureControllerIOS.mm:
+        * UIProcess/ios/WKContentView.mm:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        * UIProcess/ios/WKPDFPageNumberIndicator.mm:
+        * UIProcess/ios/WKScrollView.mm:
+        * UIProcess/mac/RemoteLayerTreeHost.mm:
+        * UIProcess/mac/ServicesController.mm:
+        * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
+        * UIProcess/mac/ViewGestureControllerMac.mm:
+        * UIProcess/mac/ViewSnapshotStore.mm:
+        * UIProcess/mac/WKViewLayoutStrategy.mm:
+        * WebProcess/Plugins/PDF/PDFPlugin.mm:
+        * WebProcess/WebPage/WebPage.cpp:
+        * WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+
 2017-08-09  John Wilander  <wilander@apple.com>
 
         Resource Load Statistics: Increase grandfathering time to 3 days

diff --git a/Source/WebKit/NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm b/Source/WebKit/NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm
index 646e0e25e85fb51648f5382141ba84e2ecf51dba..5cd8e4f8639c567d5258d605485b5f4d93bb6a48 100644 (file)
--- a/Source/WebKit/NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm
+++ b/Source/WebKit/NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm
@@ -30,12 +30,12 @@
 #import "LegacyCustomProtocolManagerMessages.h"
 #import "NetworkProcess.h"
 #import <Foundation/NSURLSession.h>
-#import <WebCore/NSURLConnectionSPI.h>
 #import <WebCore/ResourceError.h>
 #import <WebCore/ResourceRequest.h>
 #import <WebCore/ResourceResponse.h>
 #import <WebCore/TextEncoding.h>
 #import <WebCore/URL.h>
+#import <pal/spi/cocoa/NSURLConnectionSPI.h>
 
 using namespace WebKit;
 

diff --git a/Source/WebKit/NetworkProcess/Downloads/mac/DownloadMac.mm b/Source/WebKit/NetworkProcess/Downloads/mac/DownloadMac.mm
index a431c8d7cd7cd187281d0bc5811bd08f965485bc..19d2ceb3452e4d6f059b1c1ac7f86a89844db262 100644 (file)
--- a/Source/WebKit/NetworkProcess/Downloads/mac/DownloadMac.mm
+++ b/Source/WebKit/NetworkProcess/Downloads/mac/DownloadMac.mm
@@ -28,15 +28,15 @@
 
 #if !USE(NETWORK_SESSION)
 
+#import "DataReference.h"
+#import "WebPage.h"
 #import <WebCore/AuthenticationChallenge.h>
 #import <WebCore/AuthenticationMac.h>
-#import <WebCore/NSURLDownloadSPI.h>
 #import <WebCore/NotImplemented.h>
 #import <WebCore/ResourceHandle.h>
 #import <WebCore/ResourceHandleClient.h>
 #import <WebCore/ResourceResponse.h>
-#import "DataReference.h"
-#import "WebPage.h"
+#import <pal/spi/cocoa/NSURLDownloadSPI.h>
 
 #if USE(CFURLCONNECTION)
 

diff --git a/Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp b/Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp
index 5e22167eb2b309638a2a3e8a3071fc36852e868d..aea79850449a8b89798e9036d7b0e5301803aa54 100644 (file)
--- a/Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp
+++ b/Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp
@@ -31,10 +31,10 @@
 #include "Logging.h"
 #include "MachPort.h"
 #include <WebCore/MachSendRight.h>
-#include <WebCore/MachVMSPI.h>
 #include <mach/mach_error.h>
 #include <mach/mach_port.h>
 #include <mach/vm_map.h>
+#include <pal/spi/cocoa/MachVMSPI.h>
 #include <wtf/RefPtr.h>
 
 namespace WebKit {

diff --git a/Source/WebKit/Platform/mac/LayerHostingContext.mm b/Source/WebKit/Platform/mac/LayerHostingContext.mm
index 1be56523e9ced11fc0a8e44eb5dfd0935087837a..346076eaf522509ac204b8f3e768acd4b62473a9 100644 (file)
--- a/Source/WebKit/Platform/mac/LayerHostingContext.mm
+++ b/Source/WebKit/Platform/mac/LayerHostingContext.mm
@@ -27,8 +27,8 @@
 #import "LayerHostingContext.h"
 
 #import <WebCore/MachSendRight.h>
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebKitSystemInterface.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 
 using namespace WebCore;
 

diff --git a/Source/WebKit/Shared/Cocoa/DataDetectionResult.mm b/Source/WebKit/Shared/Cocoa/DataDetectionResult.mm
index e1012a48914b94a9ff9bd94fa41bb01b1a01082d..38d52524c889c330859f31766e30141cce172490 100644 (file)
--- a/Source/WebKit/Shared/Cocoa/DataDetectionResult.mm
+++ b/Source/WebKit/Shared/Cocoa/DataDetectionResult.mm
@@ -28,7 +28,7 @@
 
 #import "ArgumentCodersCF.h"
 #import "WebCoreArgumentCoders.h"
-#import <WebCore/DataDetectorsCoreSPI.h>
+#import <pal/spi/cocoa/DataDetectorsCoreSPI.h>
 #import <wtf/SoftLinking.h>
 
 SOFT_LINK_PRIVATE_FRAMEWORK(DataDetectorsCore)

diff --git a/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm b/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm
index 4904de9852869b72edc3b5f73712ba8cc6f3b6e7..09e14b632154e8e3296edc76b76cc383cc7e3f48 100644 (file)
--- a/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm
+++ b/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm
@@ -29,8 +29,8 @@
 #if ENABLE(APPLE_PAY)
 
 #import "DataReference.h"
-#import <WebCore/PassKitSPI.h>
 #import <WebCore/PaymentAuthorizationStatus.h>
+#import <pal/spi/cocoa/PassKitSPI.h>
 #import <wtf/SoftLinking.h>
 
 #if PLATFORM(MAC)

diff --git a/Source/WebKit/Shared/cf/CookieStorageUtilsCF.mm b/Source/WebKit/Shared/cf/CookieStorageUtilsCF.mm
index eab617c0a109488c073f788db9803c46ca507184..6987a7f9b25d0575c0f9a573c67ad7a16814e3bd 100644 (file)
--- a/Source/WebKit/Shared/cf/CookieStorageUtilsCF.mm
+++ b/Source/WebKit/Shared/cf/CookieStorageUtilsCF.mm
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "CookieStorageUtilsCF.h"
 
-#include <WebCore/NSURLConnectionSPI.h>
+#include <pal/spi/cocoa/NSURLConnectionSPI.h>
 
 namespace WebKit {
 

diff --git a/Source/WebKit/Shared/ios/InteractionInformationAtPosition.mm b/Source/WebKit/Shared/ios/InteractionInformationAtPosition.mm
index f5b4b0e7626ac27d51e55bb29fd6af51db16c749..fe550fb8b42cbfcc6d145fce413b8cc664b9c669 100644 (file)
--- a/Source/WebKit/Shared/ios/InteractionInformationAtPosition.mm
+++ b/Source/WebKit/Shared/ios/InteractionInformationAtPosition.mm
@@ -28,7 +28,7 @@
 
 #import "ArgumentCodersCF.h"
 #import "WebCoreArgumentCoders.h"
-#import <WebCore/DataDetectorsCoreSPI.h>
+#import <pal/spi/cocoa/DataDetectorsCoreSPI.h>
 #import <wtf/SoftLinking.h>
 
 SOFT_LINK_PRIVATE_FRAMEWORK(DataDetectorsCore)

diff --git a/Source/WebKit/Shared/mac/HangDetectionDisablerMac.mm b/Source/WebKit/Shared/mac/HangDetectionDisablerMac.mm
index a500bf39e40f3d40923d3e4fd3843bebcd5e1904..62ab1c69616cd230b48c38c64d1e15d3e3b71952 100644 (file)
--- a/Source/WebKit/Shared/mac/HangDetectionDisablerMac.mm
+++ b/Source/WebKit/Shared/mac/HangDetectionDisablerMac.mm
@@ -28,7 +28,7 @@
 
 #if PLATFORM(MAC)
 
-#include <WebCore/CoreGraphicsSPI.h>
+#include <pal/spi/cg/CoreGraphicsSPI.h>
 #include <wtf/RetainPtr.h>
 
 namespace WebKit {

diff --git a/Source/WebKit/Shared/mac/RemoteLayerBackingStore.mm b/Source/WebKit/Shared/mac/RemoteLayerBackingStore.mm
index 69a6b55ef831094c1b761bd57c1de119e4491488..4d09b84466eaae49305a8c16804259991ab71619 100644 (file)
--- a/Source/WebKit/Shared/mac/RemoteLayerBackingStore.mm
+++ b/Source/WebKit/Shared/mac/RemoteLayerBackingStore.mm
@@ -37,8 +37,8 @@
 #import <WebCore/GraphicsContextCG.h>
 #import <WebCore/IOSurface.h>
 #import <WebCore/PlatformCALayerClient.h>
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebCore/WebLayer.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 
 #if USE(IOSURFACE)
 #import <mach/mach_port.h>

diff --git a/Source/WebKit/Shared/mac/RemoteLayerTreePropertyApplier.mm b/Source/WebKit/Shared/mac/RemoteLayerTreePropertyApplier.mm
index dd1470dffaa46b9592bc4809d4a1f06e38fd55b8..ab1159c8d6457963c3d59116536179e80dfb488a 100644 (file)
--- a/Source/WebKit/Shared/mac/RemoteLayerTreePropertyApplier.mm
+++ b/Source/WebKit/Shared/mac/RemoteLayerTreePropertyApplier.mm
@@ -31,8 +31,8 @@
 #import "RemoteLayerTreeHost.h"
 #import <QuartzCore/QuartzCore.h>
 #import <WebCore/PlatformCAFilters.h>
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebCore/ScrollbarThemeMac.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 
 #if PLATFORM(IOS)

diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
index 87ee2c8792dc969c30107b503295a9d5413a64a6..7e3dea47e8dc41d987c7f328ad6a39f94bdad916 100644 (file)
--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
@@ -134,13 +134,13 @@
 #import "WKWebViewContentProviderRegistry.h"
 #import "_WKWebViewPrintFormatter.h"
 #import <UIKit/UIApplication.h>
-#import <WebCore/CoreGraphicsSPI.h>
 #import <WebCore/FrameLoaderTypes.h>
 #import <WebCore/InspectorOverlay.h>
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebCore/ScrollableArea.h>
 #import <WebCore/WebBackgroundTaskController.h>
 #import <WebCore/WebSQLiteDatabaseTrackerClient.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 
 #if __has_include(<AccessibilitySupport.h>)
 #include <AccessibilitySupport.h>

diff --git a/Source/WebKit/UIProcess/API/mac/WKView.mm b/Source/WebKit/UIProcess/API/mac/WKView.mm
index e2ff3487082d2a29d7d79e8b93fa4aa01061bd13..30374791747e220bd3009b3e33b95ab2dd7d42be 100644 (file)
--- a/Source/WebKit/UIProcess/API/mac/WKView.mm
+++ b/Source/WebKit/UIProcess/API/mac/WKView.mm
@@ -42,7 +42,7 @@
 #import "WebProcessPool.h"
 #import "WebViewImpl.h"
 #import "_WKLinkIconParametersInternal.h"
-#import <WebCore/AVKitSPI.h>
+#import <pal/spi/cocoa/AVKitSPI.h>
 #import <wtf/BlockPtr.h>
 
 using namespace WebKit;

diff --git a/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h b/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h
index 641044ac22522b2505b69362b173c67c12d16b3c..63a70e2e2c1a95dabac4ee1c323711f8497d85dc 100644 (file)
--- a/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h
+++ b/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h
@@ -27,8 +27,8 @@
 
 #if ENABLE(APPLE_PAY)
 
-#import <WebCore/PassKitSPI.h>
 #import <WebCore/PaymentHeaders.h>
+#import <pal/spi/cocoa/PassKitSPI.h>
 #import <wtf/BlockPtr.h>
 
 namespace WebCore {

diff --git a/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm b/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm
index 28e892691e6bfe84bb869a70758001c321480679..75ab734fcfb6bf9ad39741f1810e44c37b55b3a0 100644 (file)
--- a/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm
+++ b/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm
@@ -30,10 +30,10 @@
 
 #import "WebPaymentCoordinatorProxy.h"
 #import "WebProcessPool.h"
-#import <WebCore/PassKitSPI.h>
 #import <WebCore/PaymentAuthorizationStatus.h>
 #import <WebCore/PaymentHeaders.h>
 #import <WebCore/URL.h>
+#import <pal/spi/cocoa/PassKitSPI.h>
 #import <wtf/BlockPtr.h>
 #import <wtf/RunLoop.h>
 #import <wtf/SoftLinking.h>

diff --git a/Source/WebKit/UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm b/Source/WebKit/UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm
index fb28fd5498fc9b154bdf5202fbad4fa5e3154267..3d70f0eeed8c168a9852ed762cf78fb51b287a8c 100644 (file)
--- a/Source/WebKit/UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm
+++ b/Source/WebKit/UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm
@@ -30,7 +30,7 @@
 
 #import "WebPageProxy.h"
 #import "WebPaymentCoordinatorProxyCocoa.h"
-#import <WebCore/PassKitSPI.h>
+#import <pal/spi/cocoa/PassKitSPI.h>
 #import <wtf/BlockPtr.h>
 #import <wtf/SoftLinking.h>
 

diff --git a/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm b/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm
index eccb9b292196826864f0091008f93089888a18a2..2bb4db2028b63521444812427eb93f2b3d3e8847 100644 (file)
--- a/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm
+++ b/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm
@@ -38,9 +38,9 @@
 #import <QuartzCore/CoreAnimation.h>
 #import <WebCore/MachSendRight.h>
 #import <WebCore/MediaPlayerEnums.h>
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebCore/TimeRanges.h>
 #import <WebKitSystemInterface.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 
 #if PLATFORM(IOS)
 #import "RemoteLayerTreeDrawingAreaProxy.h"

diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h
index 8df6f329e0662f0452029bd6e97c6fb269853895..e3e9c6b0bcbe9e8b1e9683517079f18a000a2c8e 100644 (file)
--- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h
+++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h
@@ -34,9 +34,9 @@
 #include "WeakObjCPtr.h"
 #include "WebPageProxy.h"
 #include "_WKOverlayScrollbarStyle.h"
-#include <WebCore/AVKitSPI.h>
 #include <WebCore/TextIndicatorWindow.h>
 #include <WebCore/UserInterfaceLayoutDirection.h>
+#include <pal/spi/cocoa/AVKitSPI.h>
 #include <wtf/BlockPtr.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/WeakPtr.h>

diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
index 5f5726c46cdab5d2e0dfa4ba79a56c57f2e6d43c..8bca486a1d449b96e53189e60f5cf739003fc5de 100644 (file)
--- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
+++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
@@ -68,11 +68,9 @@
 #import "_WKRemoteObjectRegistryInternal.h"
 #import "_WKThumbnailViewInternal.h"
 #import <HIToolbox/CarbonEventsCore.h>
-#import <WebCore/AVKitSPI.h>
 #import <WebCore/AXObjectCache.h>
 #import <WebCore/ActivityState.h>
 #import <WebCore/ColorMac.h>
-#import <WebCore/CoreGraphicsSPI.h>
 #import <WebCore/DataDetectorsSPI.h>
 #import <WebCore/DictionaryLookup.h>
 #import <WebCore/DragData.h>
@@ -84,7 +82,6 @@
 #import <WebCore/NSImmediateActionGestureRecognizerSPI.h>
 #import <WebCore/NSSpellCheckerSPI.h>
 #import <WebCore/NSTextFinderSPI.h>
-#import <WebCore/NSTouchBarSPI.h>
 #import <WebCore/NSWindowSPI.h>
 #import <WebCore/PlatformEventFactoryMac.h>
 #import <WebCore/TextAlternativeWithRange.h>
@@ -96,6 +93,9 @@
 #import <WebCore/WebCoreNSStringExtras.h>
 #import <WebCore/WebPlaybackControlsManager.h>
 #import <WebKitSystemInterface.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
+#import <pal/spi/cocoa/AVKitSPI.h>
+#import <pal/spi/cocoa/NSTouchBarSPI.h>
 #import <sys/stat.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/SetForScope.h>

diff --git a/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm b/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm
index 8111948f402cf20631c8410c1069a0c6504b5b4f..a1660b4ec94aef8aa3f847b331081ab4813f04b2 100644 (file)
--- a/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm
+++ b/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm
@@ -26,11 +26,11 @@
 #import "config.h"
 #import "ProcessLauncher.h"
 
-#import <WebCore/ServersSPI.h>
 #import <WebCore/WebCoreNSStringExtras.h>
 #import <crt_externs.h>
 #import <mach-o/dyld.h>
 #import <mach/machine.h>
+#import <pal/spi/cocoa/ServersSPI.h>
 #import <spawn.h>
 #import <sys/param.h>
 #import <sys/stat.h>

diff --git a/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm b/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm
index 8fb5d747f09cf1df44466c5c6069ca50728c9378..a08f21db8b0f592e7d0d1a765d380fb71bebadcf 100644 (file)
--- a/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm
+++ b/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm
@@ -43,7 +43,7 @@
 #import "WebProcessProxy.h"
 #import <UIKit/UIScreenEdgePanGestureRecognizer.h>
 #import <WebCore/IOSurface.h>
-#import <WebCore/QuartzCoreSPI.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 
 using namespace WebCore;
 

diff --git a/Source/WebKit/UIProcess/ios/WKContentView.mm b/Source/WebKit/UIProcess/ios/WKContentView.mm
index 8ba5fb0eeb9c5a3ccb16b293a17360e3aefbb17f..d61cedfc14e26ec483e0e90c18627f2341e950c3 100644 (file)
--- a/Source/WebKit/UIProcess/ios/WKContentView.mm
+++ b/Source/WebKit/UIProcess/ios/WKContentView.mm
@@ -59,7 +59,7 @@
 #import <WebCore/InspectorOverlay.h>
 #import <WebCore/NotImplemented.h>
 #import <WebCore/PlatformScreen.h>
-#import <WebCore/QuartzCoreSPI.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/CurrentTime.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/text/TextStream.h>

diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
index b552dc46301c1bc61f6497f6ed4fc7c564cb158f..51c926901f4bf50215b094e3ea1b0a20039a0e69 100644 (file)
--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
@@ -66,8 +66,6 @@
 #import <CoreText/CTFontDescriptor.h>
 #import <MobileCoreServices/UTCoreTypes.h>
 #import <WebCore/Color.h>
-#import <WebCore/CoreGraphicsSPI.h>
-#import <WebCore/DataDetectorsCoreSPI.h>
 #import <WebCore/DataDetectorsUISPI.h>
 #import <WebCore/FloatQuad.h>
 #import <WebCore/NotImplemented.h>
@@ -81,6 +79,8 @@
 #import <WebCore/WebCoreNSURLExtras.h>
 #import <WebCore/WebEvent.h>
 #import <WebKit/WebSelectionRect.h> // FIXME: WK2 should not include WebKit headers!
+#import <pal/spi/cg/CoreGraphicsSPI.h>
+#import <pal/spi/cocoa/DataDetectorsCoreSPI.h>
 #import <wtf/Optional.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/SetForScope.h>

diff --git a/Source/WebKit/UIProcess/ios/WKPDFPageNumberIndicator.mm b/Source/WebKit/UIProcess/ios/WKPDFPageNumberIndicator.mm
index 9f4c77fef81a11dd95d9827cb4e928e3ec3ea747..6e389e65d534c3ddc32d4bfa54070eaee21a116a 100644 (file)
--- a/Source/WebKit/UIProcess/ios/WKPDFPageNumberIndicator.mm
+++ b/Source/WebKit/UIProcess/ios/WKPDFPageNumberIndicator.mm
@@ -30,7 +30,7 @@
 
 #import "UIKitSPI.h"
 #import <WebCore/LocalizedStrings.h>
-#import <WebCore/QuartzCoreSPI.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/text/WTFString.h>
 

diff --git a/Source/WebKit/UIProcess/ios/WKScrollView.mm b/Source/WebKit/UIProcess/ios/WKScrollView.mm
index 74733d8a808b42229c9d36532789b1342df60676..81380372268ff1b0b2446cb9f3a5dbfdcf0a9258 100644 (file)
--- a/Source/WebKit/UIProcess/ios/WKScrollView.mm
+++ b/Source/WebKit/UIProcess/ios/WKScrollView.mm
@@ -30,7 +30,7 @@
 
 #import "WKWebViewInternal.h"
 #import "WeakObjCPtr.h"
-#import <WebCore/CoreGraphicsSPI.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
 
 using namespace WebKit;
 

diff --git a/Source/WebKit/UIProcess/mac/RemoteLayerTreeHost.mm b/Source/WebKit/UIProcess/mac/RemoteLayerTreeHost.mm
index 71498b43863730dabc38c3adc21562f7fe56d322..d73f4dc99bf443a090987d591b3894849bd716b5 100644 (file)
--- a/Source/WebKit/UIProcess/mac/RemoteLayerTreeHost.mm
+++ b/Source/WebKit/UIProcess/mac/RemoteLayerTreeHost.mm
@@ -37,9 +37,9 @@
 #import <WebCore/GraphicsContextCG.h>
 #import <WebCore/IOSurface.h>
 #import <WebCore/PlatformLayer.h>
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebCore/WebActionDisablingCALayerDelegate.h>
 #import <WebKitSystemInterface.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 
 #if PLATFORM(IOS)
 #import <UIKit/UIView.h>

diff --git a/Source/WebKit/UIProcess/mac/ServicesController.mm b/Source/WebKit/UIProcess/mac/ServicesController.mm
index 2a892f99785eae1407c8dd6c043bb6055912f8a5..9862007a7be1e29f508b69899635eee231ca776a 100644 (file)
--- a/Source/WebKit/UIProcess/mac/ServicesController.mm
+++ b/Source/WebKit/UIProcess/mac/ServicesController.mm
@@ -30,9 +30,9 @@
 
 #import "WebProcessMessages.h"
 #import "WebProcessPool.h"
-#import <WebCore/NSExtensionSPI.h>
 #import <WebCore/NSSharingServicePickerSPI.h>
 #import <WebCore/NSSharingServiceSPI.h>
+#import <pal/spi/cocoa/NSExtensionSPI.h>
 #import <wtf/NeverDestroyed.h>
 
 namespace WebKit {

diff --git a/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm b/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm
index 010d7732dabea826cf9758efcd0d6f54efe20cf1..4a6f9ea090a5e9bc590c027e387a2c02e4ceb875 100644 (file)
--- a/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm
+++ b/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm
@@ -35,7 +35,7 @@
 #import "WebPageProxy.h"
 #import "WebProcessProxy.h"
 #import <WebCore/MachSendRight.h>
-#import <WebCore/QuartzCoreSPI.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/BlockPtr.h>
 
 using namespace IPC;

diff --git a/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm b/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm
index eb5ab2238564c06205d232684b0014f03453b621..c9784cc6eea15a2bb547ef1ac52187b3fbf49420 100644 (file)
--- a/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm
+++ b/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm
@@ -44,8 +44,8 @@
 #import <Cocoa/Cocoa.h>
 #import <WebCore/IOSurface.h>
 #import <WebCore/NSEventSPI.h>
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebCore/WebActionDisablingCALayerDelegate.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 
 using namespace WebCore;
 

diff --git a/Source/WebKit/UIProcess/mac/ViewSnapshotStore.mm b/Source/WebKit/UIProcess/mac/ViewSnapshotStore.mm
index 2f5a950835f1a9d22af5a98a01b676b977769dc0..aef7c3362211b18edce85213657b9a5137e6be11 100644 (file)
--- a/Source/WebKit/UIProcess/mac/ViewSnapshotStore.mm
+++ b/Source/WebKit/UIProcess/mac/ViewSnapshotStore.mm
@@ -32,7 +32,7 @@
 #import <WebCore/IOSurface.h>
 
 #if PLATFORM(IOS)
-#import <WebCore/QuartzCoreSPI.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #endif
 
 using namespace WebCore;

diff --git a/Source/WebKit/UIProcess/mac/WKViewLayoutStrategy.mm b/Source/WebKit/UIProcess/mac/WKViewLayoutStrategy.mm
index 75330b04221f0c3d9764fa98efa5a8918539a7fe..6c79534c4a65fa72280285d2bd851cf5145b769f 100644 (file)
--- a/Source/WebKit/UIProcess/mac/WKViewLayoutStrategy.mm
+++ b/Source/WebKit/UIProcess/mac/WKViewLayoutStrategy.mm
@@ -31,7 +31,7 @@
 #import "WebPageProxy.h"
 #import "WebViewImpl.h"
 #import <WebCore/MachSendRight.h>
-#import <WebCore/QuartzCoreSPI.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 
 using namespace WebCore;
 using namespace WebKit;

diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm b/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
index d16fd2295080f84608e0e73849da650711dc6935..f2f080cc1953a90f00a6c7b2195f1308fe0fe1a9 100644 (file)
--- a/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
+++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
@@ -54,7 +54,6 @@
 #import <WebCore/AXObjectCache.h>
 #import <WebCore/ArchiveResource.h>
 #import <WebCore/Chrome.h>
-#import <WebCore/CoreGraphicsSPI.h>
 #import <WebCore/Cursor.h>
 #import <WebCore/DictionaryLookup.h>
 #import <WebCore/DocumentLoader.h>
@@ -81,6 +80,7 @@
 #import <WebCore/Settings.h>
 #import <WebCore/WheelEventTestTrigger.h>
 #import <WebKitSystemInterface.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <wtf/CurrentTime.h>
 #import <wtf/UUID.h>
 

diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
index c755e9370a10d3a347e20c3278b2ab3bb0d4f096..7f9b29bdb1a6cb8bbafef955c016676558d02f5b 100644 (file)
--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
@@ -234,8 +234,8 @@
 #if PLATFORM(IOS)
 #include "RemoteLayerTreeDrawingArea.h"
 #include <CoreGraphics/CoreGraphics.h>
-#include <WebCore/CoreTextSPI.h>
 #include <WebCore/Icon.h>
+#include <pal/spi/cocoa/CoreTextSPI.h>
 #endif
 
 #ifndef NDEBUG

diff --git a/Source/WebKit/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm b/Source/WebKit/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm
index a8e629a803af72342cf6b58a93a437e516cfa9f5..06e273c3a719e69100d15f5a31a1a2d45ff6ff42 100644 (file)
--- a/Source/WebKit/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm
+++ b/Source/WebKit/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm
@@ -33,8 +33,8 @@
 #import <WebCore/GraphicsLayer.h>
 #import <WebCore/PlatformCAAnimationCocoa.h>
 #import <WebCore/PlatformCAFilters.h>
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebCore/TimingFunction.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 #import <wtf/CurrentTime.h>
 #import <wtf/RetainPtr.h>

diff --git a/Source/WebKit/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm b/Source/WebKit/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm
index 358bb8a8c91b8b3f5a9128634f8709644ea71582..f146fa0f0b8665c9d240608ded71ecb83563a163 100644 (file)
--- a/Source/WebKit/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm
+++ b/Source/WebKit/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm
@@ -44,11 +44,11 @@
 #import <WebCore/InspectorController.h>
 #import <WebCore/MainFrame.h>
 #import <WebCore/PageOverlayController.h>
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebCore/RenderLayerCompositor.h>
 #import <WebCore/RenderView.h>
 #import <WebCore/Settings.h>
 #import <WebCore/TiledBacking.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/SystemTracing.h>
 
 using namespace WebCore;

diff --git a/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm b/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
index 1e79dddef9a6ffc5b8966330333a7c6c8d72a25b..702dd7f95c8734ecc02faefc987e6f1e9bfadbdd 100644 (file)
--- a/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
+++ b/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
@@ -49,7 +49,6 @@
 #import <WebCore/MainFrame.h>
 #import <WebCore/Page.h>
 #import <WebCore/PlatformCAAnimationCocoa.h>
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebCore/RenderLayerBacking.h>
 #import <WebCore/RenderLayerCompositor.h>
 #import <WebCore/RenderView.h>
@@ -57,6 +56,7 @@
 #import <WebCore/Settings.h>
 #import <WebCore/TiledBacking.h>
 #import <WebCore/WebActionDisablingCALayerDelegate.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/MainThread.h>
 
 #if ENABLE(ASYNC_SCROLLING)

diff --git a/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm b/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
index 8cce64e3ed2285493d05b16f50443ff1c168af8f..b6590a56ed25dae7922162ec68df1f386a4de78d 100644 (file)
--- a/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
+++ b/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
@@ -55,15 +55,15 @@
 #import <WebCore/MemoryRelease.h>
 #import <WebCore/NSAccessibilitySPI.h>
 #import <WebCore/PerformanceLogging.h>
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebCore/RuntimeApplicationChecks.h>
 #import <WebCore/WebCoreNSURLExtras.h>
-#import <WebCore/pthreadSPI.h>
 #import <WebKitSystemInterface.h>
 #import <algorithm>
 #import <dispatch/dispatch.h>
 #import <objc/runtime.h>
 #import <pal/spi/cf/CFNetworkSPI.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
+#import <pal/spi/cocoa/pthreadSPI.h>
 #import <runtime/ConfigFile.h>
 #import <stdio.h>
 

diff --git a/Source/WebKitLegacy/ios/ChangeLog b/Source/WebKitLegacy/ios/ChangeLog
index e64322671c22ff3d9cd7e5fc7747215a311c2ecc..6c419b0d0825c2f4ea03edd5a52ee7f826d30edf 100644 (file)
--- a/Source/WebKitLegacy/ios/ChangeLog
+++ b/Source/WebKitLegacy/ios/ChangeLog
@@ -1,3 +1,13 @@
+2017-08-09  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [PAL] Move spi/cocoa and spi/cg directories into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175175
+
+        Reviewed by Myles C. Maxfield.
+
+        * Misc/WebNSStringExtrasIOS.m:
+        * WebCoreSupport/WebFixedPositionContent.mm:
+
 2017-07-17  Daniel Bates  <dabates@apple.com>
 
         Cleanup: Use OptionSet to represent marker types

diff --git a/Source/WebKitLegacy/ios/Misc/WebNSStringExtrasIOS.m b/Source/WebKitLegacy/ios/Misc/WebNSStringExtrasIOS.m
index e57e2e872bc5ba223be5f6d4af68b0ffb7e18129..65c07b2356863c81d77a052d598ef68d622caecd 100644 (file)
--- a/Source/WebKitLegacy/ios/Misc/WebNSStringExtrasIOS.m
+++ b/Source/WebKitLegacy/ios/Misc/WebNSStringExtrasIOS.m
@@ -27,7 +27,7 @@
 
 #import "WebNSStringExtrasIOS.h"
 #import "WebNSURLExtras.h"
-#import <WebCore/NSStringSPI.h>
+#import <pal/spi/cocoa/NSStringSPI.h>
 
 @implementation NSString (WebNSStringExtrasIOS)
 

diff --git a/Source/WebKitLegacy/ios/WebCoreSupport/WebFixedPositionContent.mm b/Source/WebKitLegacy/ios/WebCoreSupport/WebFixedPositionContent.mm
index 4d482daa37d284f23f4bc64edd81aa060350dda3..f5d35929e7c4ae13aebf4a9d913865193b0587e2 100644 (file)
--- a/Source/WebKitLegacy/ios/WebCoreSupport/WebFixedPositionContent.mm
+++ b/Source/WebKitLegacy/ios/WebCoreSupport/WebFixedPositionContent.mm
@@ -30,11 +30,11 @@
 
 #import "WebViewInternal.h"
 #import <WebCore/ChromeClient.h>
-#import <WebCore/CoreGraphicsSPI.h>
 #import <WebCore/Frame.h>
 #import <WebCore/IntSize.h>
 #import <WebCore/ScrollingConstraints.h>
 #import <WebCore/WebCoreThreadRun.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
 
 #import <wtf/HashMap.h>
 #import <wtf/NeverDestroyed.h>

diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
index cbb071a9c08a7c72683fa3ae89ab9113e84394d9..3ec9b29abd45145730c11b6b8b2df333802be7e8 100644 (file)
--- a/Source/WebKitLegacy/mac/ChangeLog
+++ b/Source/WebKitLegacy/mac/ChangeLog
@@ -1,3 +1,22 @@
+2017-08-09  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [PAL] Move spi/cocoa and spi/cg directories into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175175
+
+        Reviewed by Myles C. Maxfield.
+
+        * History/WebHistory.mm:
+        * Misc/WebDownload.mm:
+        * Misc/WebKitNSStringExtras.mm:
+        * Plugins/Hosted/NetscapePluginHostManager.mm:
+        * Plugins/WebPluginDatabase.mm:
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        * WebInspector/WebNodeHighlight.mm:
+        * WebView/WebHTMLView.mm:
+        * WebView/WebIndicateLayer.mm:
+        * WebView/WebView.mm:
+        * WebView/WebViewData.h:
+
 2017-08-09  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         [iOS DnD] ENABLE_DRAG_SUPPORT should be turned off for iOS 10 and enabled by default

diff --git a/Source/WebKitLegacy/mac/History/WebHistory.mm b/Source/WebKitLegacy/mac/History/WebHistory.mm
index 7f4272d2ddddfe07fc92629a410b830c7ea7a386..90d9a077852c717b6f8d63a33781bfe41f8ec664 100644 (file)
--- a/Source/WebKitLegacy/mac/History/WebHistory.mm
+++ b/Source/WebKitLegacy/mac/History/WebHistory.mm
@@ -35,8 +35,8 @@
 #import "WebTypesInternal.h"
 #import "WebVisitedLinkStore.h"
 #import <WebCore/HistoryItem.h>
-#import <WebCore/NSCalendarDateSPI.h>
 #import <WebCore/PageGroup.h>
+#import <pal/spi/cocoa/NSCalendarDateSPI.h>
 
 #if PLATFORM(IOS)
 #import <WebCore/WebCoreThreadMessage.h>

diff --git a/Source/WebKitLegacy/mac/Misc/WebDownload.mm b/Source/WebKitLegacy/mac/Misc/WebDownload.mm
index 392f04facb721ac262f7677785111d2b283776dc..bd77d387ce5436a1a2cbbfce04b6f1daf3385a86 100644 (file)
--- a/Source/WebKitLegacy/mac/Misc/WebDownload.mm
+++ b/Source/WebKitLegacy/mac/Misc/WebDownload.mm
@@ -33,9 +33,9 @@
 #import <WebCore/AuthenticationMac.h>
 #import <WebCore/Credential.h>
 #import <WebCore/CredentialStorage.h>
-#import <WebCore/NSURLDownloadSPI.h>
 #import <WebCore/ProtectionSpace.h>
 #import <WebKitLegacy/WebPanelAuthenticationHandler.h>
+#import <pal/spi/cocoa/NSURLDownloadSPI.h>
 #import <wtf/Assertions.h>
 
 #import "WebTypesInternal.h"

diff --git a/Source/WebKitLegacy/mac/Misc/WebKitNSStringExtras.mm b/Source/WebKitLegacy/mac/Misc/WebKitNSStringExtras.mm
index a760c7682fe5d883bc916adce435b69f313dcbdc..b645f3b97a53aa2cee75698a9da52884c8b9b64a 100644 (file)
--- a/Source/WebKitLegacy/mac/Misc/WebKitNSStringExtras.mm
+++ b/Source/WebKitLegacy/mac/Misc/WebKitNSStringExtras.mm
@@ -28,15 +28,15 @@
 
 #import "WebKitNSStringExtras.h"
 
-#import <WebCore/CoreGraphicsSPI.h>
 #import <WebCore/FontCascade.h>
 #import <WebCore/GraphicsContext.h>
 #import <WebCore/TextRun.h>
 #import <WebCore/WebCoreNSStringExtras.h>
 #import <WebKitLegacy/WebNSFileManagerExtras.h>
 #import <WebKitLegacy/WebNSObjectExtras.h>
-#import <unicode/uchar.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
 #import <sys/param.h>
+#import <unicode/uchar.h>
 
 #if PLATFORM(IOS)
 #import <WebKitLegacy/DOM.h>

diff --git a/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostManager.mm b/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostManager.mm
index 5b954b8067ada465718d1711a358f3ff752d2166..b93e78f63eaf1de0a0be7b4ea6d54e97b2a4387c 100644 (file)
--- a/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostManager.mm
+++ b/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostManager.mm
@@ -32,9 +32,9 @@
 #import "WebKitSystemInterface.h"
 #import "WebLocalizableStringsInternal.h"
 #import "WebNetscapePluginPackage.h"
-#import <WebCore/ServersSPI.h>
 #import <WebCore/WebCoreNSStringExtras.h>
 #import <mach/mach_port.h>
+#import <pal/spi/cocoa/ServersSPI.h>
 #import <spawn.h>
 #import <wtf/Assertions.h>
 #import <wtf/NeverDestroyed.h>

diff --git a/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm b/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm
index b2ed5b59607508271aae9b2e5115cbdf359a2311..4182f0b3ebc7f8ec5991e17c6edb89c081bd9679 100644 (file)
--- a/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm
+++ b/Source/WebKitLegacy/mac/Plugins/WebPluginDatabase.mm
@@ -40,10 +40,10 @@
 #import "WebNetscapePluginPackage.h"
 #import "WebPluginController.h"
 #import "WebPluginPackage.h"
-#import "WebViewPrivate.h"
 #import "WebViewInternal.h"
-#import <WebCore/NSURLFileTypeMappingsSPI.h>
+#import "WebViewPrivate.h"
 #import <WebKitSystemInterface.h>
+#import <pal/spi/cocoa/NSURLFileTypeMappingsSPI.h>
 #import <wtf/Assertions.h>
 
 #if PLATFORM(IOS)

diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm b/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
index e6ea4d673a281e1a2de811476e2ca3cafee661fb..1ed09f78fd0db108b5706944c77954d1983e03b4 100644 (file)
--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
+++ b/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
@@ -105,8 +105,6 @@
 #import <WebCore/MIMETypeRegistry.h>
 #import <WebCore/MainFrame.h>
 #import <WebCore/MouseEvent.h>
-#import <WebCore/NSURLDownloadSPI.h>
-#import <WebCore/NSURLFileTypeMappingsSPI.h>
 #import <WebCore/Page.h>
 #import <WebCore/PluginBlacklist.h>
 #import <WebCore/PluginViewBase.h>
@@ -125,6 +123,8 @@
 #import <WebKitLegacy/DOMElement.h>
 #import <WebKitLegacy/DOMHTMLFormElement.h>
 #import <WebKitSystemInterface.h>
+#import <pal/spi/cocoa/NSURLDownloadSPI.h>
+#import <pal/spi/cocoa/NSURLFileTypeMappingsSPI.h>
 #import <runtime/InitializeThreading.h>
 #import <wtf/BlockObjCExceptions.h>
 #import <wtf/MainThread.h>
@@ -148,9 +148,9 @@
 #endif
 
 #if USE(QUICK_LOOK)
-#import <WebCore/NSFileManagerSPI.h>
 #import <WebCore/PreviewLoaderClient.h>
 #import <WebCore/QuickLook.h>
+#import <pal/spi/cocoa/NSFileManagerSPI.h>
 #endif
 
 #if HAVE(APP_LINKS)

diff --git a/Source/WebKitLegacy/mac/WebInspector/WebNodeHighlight.mm b/Source/WebKitLegacy/mac/WebInspector/WebNodeHighlight.mm
index 61c6aeb86bd8d9e418f0324bfa66dd13f97ad749..df12e578215690d40cd764ec3278674c18444333 100644 (file)
--- a/Source/WebKitLegacy/mac/WebInspector/WebNodeHighlight.mm
+++ b/Source/WebKitLegacy/mac/WebInspector/WebNodeHighlight.mm
@@ -37,8 +37,8 @@
 #import "WebFramePrivate.h"
 #import "WebHTMLView.h"
 #import "WebView.h"
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebCore/WAKWindow.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #endif
 
 using namespace WebCore;

diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
index f94733bbeac393f63d30ff82a1da2f59a33a68cf..6ba45dc40a2e3edf316f6a4dd504afd2ae0457b3 100644 (file)
--- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
@@ -108,7 +108,6 @@
 #import <WebCore/MIMETypeRegistry.h>
 #import <WebCore/MainFrame.h>
 #import <WebCore/NSSpellCheckerSPI.h>
-#import <WebCore/NSURLFileTypeMappingsSPI.h>
 #import <WebCore/NSViewSPI.h>
 #import <WebCore/Page.h>
 #import <WebCore/PrintContext.h>
@@ -132,6 +131,7 @@
 #import <WebKitSystemInterface.h>
 #import <dlfcn.h>
 #import <limits>
+#import <pal/spi/cocoa/NSURLFileTypeMappingsSPI.h>
 #import <runtime/InitializeThreading.h>
 #import <wtf/BlockObjCExceptions.h>
 #import <wtf/MainThread.h>

diff --git a/Source/WebKitLegacy/mac/WebView/WebIndicateLayer.mm b/Source/WebKitLegacy/mac/WebView/WebIndicateLayer.mm
index 2f0c166cd5282773eb90e9e39a9cb5b45dffa92e..52c460ea3447ef41451edd637259f0bece066b5b 100644 (file)
--- a/Source/WebKitLegacy/mac/WebView/WebIndicateLayer.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebIndicateLayer.mm
@@ -30,8 +30,8 @@
 #import "WebFramePrivate.h"
 #import "WebView.h"
 #import <WebCore/ColorMac.h>
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebCore/WAKWindow.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/NeverDestroyed.h>
 
 using namespace WebCore;

diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
index 3b63f76437320f368d1219bdb38a400d971b66ff..ab4af4e8637a4b197d410a4a6d4925fee5631fe9 100644 (file)
--- a/Source/WebKitLegacy/mac/WebView/WebView.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebView.mm
@@ -166,8 +166,6 @@
 #import <WebCore/MemoryCache.h>
 #import <WebCore/MemoryRelease.h>
 #import <WebCore/NSSpellCheckerSPI.h>
-#import <WebCore/NSTouchBarSPI.h>
-#import <WebCore/NSURLFileTypeMappingsSPI.h>
 #import <WebCore/NetworkStorageSession.h>
 #import <WebCore/NodeList.h>
 #import <WebCore/Notification.h>
@@ -211,6 +209,8 @@
 #import <mach-o/dyld.h>
 #import <objc/runtime.h>
 #import <pal/spi/cf/CFNetworkSPI.h>
+#import <pal/spi/cocoa/NSTouchBarSPI.h>
+#import <pal/spi/cocoa/NSURLFileTypeMappingsSPI.h>
 #import <runtime/ArrayPrototype.h>
 #import <runtime/CatchScope.h>
 #import <runtime/DateInstance.h>
@@ -240,12 +240,12 @@
 #import "WebNSPasteboardExtras.h"
 #import "WebNSPrintOperationExtras.h"
 #import "WebPDFView.h"
-#import <WebCore/AVKitSPI.h>
 #import <WebCore/LookupSPI.h>
 #import <WebCore/NSImmediateActionGestureRecognizerSPI.h>
 #import <WebCore/TextIndicator.h>
 #import <WebCore/TextIndicatorWindow.h>
 #import <WebCore/WebVideoFullscreenController.h>
+#import <pal/spi/cocoa/AVKitSPI.h>
 #else
 #import "MemoryMeasure.h"
 #import "WebCaretChangeListener.h"

diff --git a/Source/WebKitLegacy/mac/WebView/WebViewData.h b/Source/WebKitLegacy/mac/WebView/WebViewData.h
index bdedf773ddfde066fa52e1756cb68222746cf4cc..3f214ca83151d033ebabaebc9d3ab4130d103f9a 100644 (file)
--- a/Source/WebKitLegacy/mac/WebView/WebViewData.h
+++ b/Source/WebKitLegacy/mac/WebView/WebViewData.h
@@ -31,7 +31,7 @@
 #import "WebDelegateImplementationCaching.h"
 #import "WebUIDelegate.h"
 #if HAVE(TOUCH_BAR)
-#import <WebCore/AVKitSPI.h>
+#import <pal/spi/cocoa/AVKitSPI.h>
 #endif
 #import <WebCore/AlternativeTextClient.h>
 #import <WebCore/LayerFlushScheduler.h>

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6ccca64558fcf60d92beb196df17561bd0f612ec..b52d09a33f5a775311ea1605a7420d7762cadd17 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,29 @@
+2017-08-09  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [PAL] Move spi/cocoa and spi/cg directories into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175175
+
+        Reviewed by Myles C. Maxfield.
+
+        * DumpRenderTree/ios/PixelDumpSupportIOS.mm:
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        * TestWebKitAPI/Tests/WebKit2Cocoa/NSFileManagerExtras.mm:
+        * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
+
+        * Scripts/webkitpy/style/checker.py:
+        * Scripts/webkitpy/style/checker_unittest.py:
+        (GlobalVariablesTest.test_path_rules_specifier):
+
+        Add path rules specifiers for PassKitSPI.h and DataDetectorsCoreSPI.h
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_braces):
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (WebKitStyleTest.test_braces.CF_OPTIONS):
+        (WebKitStyleTest.test_braces):
+
+        Prevent CF_OPTIONS() from being handled as funtion definition.
+
 2017-08-09  Don Olmstead  <don.olmstead@sony.com>
 
         [WTF] Move TextStream into WTF

diff --git a/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm b/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm
index a5aea43a23b8dc1fd877d010f706c42d38dc18dd..48f7cce4cf21c83c6419f2728eb19e6ded1cecdd 100644 (file)
--- a/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm
+++ b/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm
@@ -38,12 +38,12 @@
 #import <CommonCrypto/CommonDigest.h>
 #import <MobileCoreServices/UTCoreTypes.h>
 #import <QuartzCore/QuartzCore.h>
-#import <WebCore/CoreGraphicsSPI.h>
 #import <WebCore/GraphicsContextCG.h>
 #import <WebCore/IOSurface.h>
 #import <WebCore/PlatformScreen.h>
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebKit/WebCoreThread.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 #import <wtf/RefCounted.h>
 #import <wtf/RefPtr.h>

diff --git a/Tools/DumpRenderTree/mac/DumpRenderTree.mm b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
index a2f134ad99968d36ad2c34d165f6b97fd20a727e..2531b6ef349cec9e4c9a6f903f00268c371d018b 100644 (file)
--- a/Tools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -107,12 +107,12 @@
 #import "UIKitSPI.h"
 #import "UIKitTestSPI.h"
 #import <QuartzCore/QuartzCore.h>
-#import <WebCore/CoreGraphicsSPI.h>
 #import <WebKit/WAKWindow.h>
 #import <WebKit/WebCoreThread.h>
 #import <WebKit/WebCoreThreadRun.h>
 #import <WebKit/WebDOMOperations.h>
 #import <fcntl.h>
+#import <pal/spi/cg/CoreGraphicsSPI.h>
 #endif
 
 extern "C" {

diff --git a/Tools/Scripts/webkitpy/style/checker.py b/Tools/Scripts/webkitpy/style/checker.py
index a1618fd62cfaa9e6c95ce41bdce219d4fa79e3a0..bad576cd3f4715aa696835fcc6a48a3e6815a3e5 100644 (file)
--- a/Tools/Scripts/webkitpy/style/checker.py
+++ b/Tools/Scripts/webkitpy/style/checker.py
@@ -236,6 +236,15 @@ _PATH_RULES_SPECIFIER = [
       os.path.join('Source', 'JavaScriptCore', 'parser', 'Keywords.table')],
      ["+whitespace/carriage_return"]),
 
+    ([# DataDetectorsCoreSPI.h declares enum bitfields as CFIndex.
+      os.path.join('Source', 'WebCore', 'PAL', 'pal', 'spi', 'cocoa', 'DataDetectorsCoreSPI.h')],
+     ["-runtime/enum_bitfields"]),
+
+    ([# PassKitSPI.h imports "PassKit.h" at two lines depending on the build configuration,
+      # which causes a false positive error.
+      os.path.join('Source', 'WebCore', 'PAL', 'pal', 'spi', 'cocoa', 'PassKitSPI.h')],
+     ["-build/include"]),
+
     ([# Some SPI headers have identifier names with underscores.
       os.path.join('Source', 'WebCore', 'PAL', 'pal', 'spi')],
      ["-readability/naming/underscores"]),

diff --git a/Tools/Scripts/webkitpy/style/checker_unittest.py b/Tools/Scripts/webkitpy/style/checker_unittest.py
index 177bbb53202baac6471ba3ff453c3a39b2692ab1..62c19362b96ae27d05af05221219550756115731 100644 (file)
--- a/Tools/Scripts/webkitpy/style/checker_unittest.py
+++ b/Tools/Scripts/webkitpy/style/checker_unittest.py
@@ -247,6 +247,14 @@ class GlobalVariablesTest(unittest.TestCase):
         # Javascript keywords.
         assertCheck(os.path.join('Source', 'JavaScriptCore', 'parser', 'Keywords.table'), "whitespace/carriage_return")
 
+        # Test if the exception for DataDetectorsCoreSPI.h is in place.
+        assertNoCheck(os.path.join('Source', 'WebCore', 'PAL', 'pal', 'spi', 'cocoa', 'DataDetectorsCoreSPI.h'),
+                      "runtime/enum_bitfields")
+
+        # Test if the exception for PassKitSPI.h is in place.
+        assertNoCheck(os.path.join('Source', 'WebCore', 'PAL', 'pal', 'spi', 'cocoa', 'PassKitSPI.h'),
+                      "build/include")
+
         # Test if the exception for pal/spi is in place.
         assertNoCheck(os.path.join('Source', 'WebCore', 'PAL', 'pal', 'spi'),
                       "readability/naming/underscores")

diff --git a/Tools/Scripts/webkitpy/style/checkers/cpp.py b/Tools/Scripts/webkitpy/style/checkers/cpp.py
index 06ee8ad478c483c12390a06d80ab66bc1840ffa0..2f1c73bf005f8a1e9ba8898c3b318d479b5e732d 100644 (file)
--- a/Tools/Scripts/webkitpy/style/checkers/cpp.py
+++ b/Tools/Scripts/webkitpy/style/checkers/cpp.py
@@ -2431,7 +2431,7 @@ def check_braces(clean_lines, line_number, file_state, error):
         # and '- (' and '+ (' for Objective-C methods.
         previous_line = get_previous_non_blank_line(clean_lines, line_number)[0]
         if ((not search(r'[;:}{)=]\s*$|\)\s*((const|override|const override|final|const final)\s*)?(->\s*\S+)?\s*$', previous_line)
-             or search(r'\b(if|for|while|switch|else|NS_ENUM|NS_ERROR_ENUM|NS_OPTIONS)\b', previous_line)
+             or search(r'\b(if|for|while|switch|else|CF_OPTIONS|NS_ENUM|NS_ERROR_ENUM|NS_OPTIONS)\b', previous_line)
              or regex_for_lambdas_and_blocks(previous_line, line_number, file_state, error))
             and previous_line.find('#') < 0
             and previous_line.find('- (') != 0
@@ -2440,7 +2440,7 @@ def check_braces(clean_lines, line_number, file_state, error):
                   'This { should be at the end of the previous line')
     elif (search(r'\)\s*(((const|override|final)\s*)*\s*)?{\s*$', line)
           and line.count('(') == line.count(')')
-          and not search(r'(\s*(if|for|while|switch|NS_ENUM|NS_ERROR_ENUM|NS_OPTIONS|@synchronized)|} @catch)\b', line)
+          and not search(r'(\s*(if|for|while|switch|CF_OPTIONS|NS_ENUM|NS_ERROR_ENUM|NS_OPTIONS|@synchronized)|} @catch)\b', line)
           and not regex_for_lambdas_and_blocks(line, line_number, file_state, error)
           and line.find("](") < 0
           and not match(r'\s+[A-Z_][A-Z_0-9]+\b', line)):

diff --git a/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py b/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py
index 4367a738a9a485112945002666b260f4edab087d..aa5f6963bf2efd8aca246d31cd909865815aff27 100644 (file)
--- a/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py
+++ b/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py
@@ -4491,6 +4491,18 @@ class WebKitStyleTest(CppStyleTestBase):
             'case foo: return;\n'
             '}\n',
             'This { should be at the end of the previous line  [whitespace/braces] [4]')
+        self.assert_multi_line_lint(
+            'typedef CF_OPTIONS(NSInteger, type)\n'
+            '{\n'
+            '    0,\n'
+            '    1\n'
+            '};',
+            'This { should be at the end of the previous line  [whitespace/braces] [4]')
+        self.assert_multi_line_lint(
+            'typedef CF_OPTIONS(NSInteger, type) {\n'
+            '    0,\n'
+            '    1\n'
+            '};', '')
         self.assert_multi_line_lint(
             'typedef NS_ENUM(NSInteger, type)\n'
             '{\n'

diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/NSFileManagerExtras.mm b/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/NSFileManagerExtras.mm
index 84c0d574161f910903e7a0eb87f5331adb79020a..b624f92c4cff9271a46b558cc4d381339c7ed4ab 100644 (file)
--- a/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/NSFileManagerExtras.mm
+++ b/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/NSFileManagerExtras.mm
@@ -29,8 +29,8 @@
 
 #import "PlatformUtilities.h"
 #import "Test.h"
-#import <WebCore/NSFileManagerSPI.h>
 #import <WebKit/_WKNSFileManagerExtras.h>
+#import <pal/spi/cocoa/NSFileManagerSPI.h>
 
 static void expectAttributes(NSDictionary *attributes, NSNumber *expectedPermissions, NSString *expectedFileType)
 {

diff --git a/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm b/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm
index 9fb916b8c831f1599f746d5d05e7e1e479e67b90..62f09192d13ca19210a269d279bc897243a1595e 100644 (file)
--- a/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm
+++ b/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm
@@ -29,12 +29,12 @@
 #import "TestController.h"
 #import "TestRunnerWKWebView.h"
 #import "UIKitTestSPI.h"
-#import <WebCore/QuartzCoreSPI.h>
 #import <WebKit/WKImageCG.h>
 #import <WebKit/WKPreferencesPrivate.h>
 #import <WebKit/WKSnapshotConfiguration.h>
 #import <WebKit/WKWebViewConfiguration.h>
 #import <WebKit/WKWebViewPrivate.h>
+#import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 #import <wtf/RetainPtr.h>