[PAL] Move spi/ios and spi/win directories into PAL

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

Patch by Yoshiaki Jitsukawa <Yoshiaki.Jitsukawa@sony.com> on 2017-08-16
Reviewed by Antti Koivisto.

Source/WebCore:

* PlatformWin.cmake:
* WebCore.xcodeproj/project.pbxproj:
* editing/cocoa/DataDetection.mm:
* loader/ios/PreviewLoader.mm:
* page/CaptionUserPreferencesMediaAF.cpp:
* page/cocoa/MemoryReleaseCocoa.mm:
* page/cocoa/SettingsCocoa.mm:
* page/ios/UserAgentIOS.mm:
* platform/audio/ios/MediaSessionManagerIOS.mm:
* platform/graphics/ca/PlatformCALayer.cpp:
* platform/graphics/cocoa/FontCascadeCocoa.mm:
* platform/graphics/cocoa/GraphicsContext3DCocoa.mm:
* platform/graphics/opentype/OpenTypeCG.h:
* platform/graphics/win/SimpleFontDataCGWin.cpp:
* platform/graphics/win/SimpleFontDataDirect2D.cpp:
* platform/ios/Device.h:
* platform/ios/PlatformPasteboardIOS.mm:
* platform/ios/PlatformScreenIOS.mm:
* platform/ios/QuickLookSoftLink.h:
* platform/ios/QuickLookSoftLink.mm:
* platform/ios/ValidationBubbleIOS.mm:
* platform/ios/WebItemProviderPasteboard.mm:
* platform/network/ios/PreviewConverter.mm:
* platform/sql/SQLiteFileSystem.cpp:
* rendering/RenderThemeIOS.mm:

Source/WebCore/PAL:

* PAL.xcodeproj/project.pbxproj:
* pal/spi/ios/CoreUISPI.h: Renamed from Source/WebCore/platform/spi/ios/CoreUISPI.h.
* pal/spi/ios/DataDetectorsUISPI.h: Renamed from Source/WebCore/platform/spi/ios/DataDetectorsUISPI.h.
* pal/spi/ios/GraphicsServicesSPI.h: Renamed from Source/WebCore/platform/spi/ios/GraphicsServicesSPI.h.
* pal/spi/ios/LaunchServicesSPI.h: Renamed from Source/WebCore/platform/spi/ios/LaunchServicesSPI.h.
* pal/spi/ios/MediaPlayerSPI.h: Renamed from Source/WebCore/platform/spi/ios/MediaPlayerSPI.h.
* pal/spi/ios/MobileGestaltSPI.h: Renamed from Source/WebCore/platform/spi/ios/MobileGestaltSPI.h.
* pal/spi/ios/OpenGLESSPI.h: Renamed from Source/WebCore/platform/spi/ios/OpenGLESSPI.h.
* pal/spi/ios/QuickLookSPI.h: Renamed from Source/WebCore/platform/spi/ios/QuickLookSPI.h.
* pal/spi/ios/SQLite3SPI.h: Renamed from Source/WebCore/platform/spi/ios/SQLite3SPI.h.
* pal/spi/ios/UIKitSPI.h: Renamed from Source/WebCore/platform/spi/ios/UIKitSPI.h.
* pal/spi/win/CoreTextSPIWin.h: Renamed from Source/WebCore/platform/spi/win/CoreTextSPIWin.h.

Source/WebKit:

* UIProcess/Cocoa/NavigationState.mm:
* UIProcess/ios/WKActionSheetAssistant.h:
* UIProcess/ios/WKActionSheetAssistant.mm:
* UIProcess/ios/WKContentViewInteraction.mm:
* UIProcess/ios/forms/WKAirPlayRoutePicker.mm:
* WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm:
* WebProcess/cocoa/WebProcessCocoa.mm:

Source/WebKitLegacy:

* Storage/StorageTracker.cpp:

Source/WebKitLegacy/mac:

* WebCoreSupport/WebFrameLoaderClient.mm:
* WebView/WebView.mm:

Tools:

* DumpRenderTree/mac/EventSendingController.mm:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 97703f70c61568e4dab59dbc4867657f95d96730..823a0fc5e140a11fb1e4f5cab9787d05ebdabd0c 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,36 @@
+2017-08-16  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [PAL] Move spi/ios and spi/win directories into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175171
+
+        Reviewed by Antti Koivisto.
+
+        * PlatformWin.cmake:
+        * WebCore.xcodeproj/project.pbxproj:
+        * editing/cocoa/DataDetection.mm:
+        * loader/ios/PreviewLoader.mm:
+        * page/CaptionUserPreferencesMediaAF.cpp:
+        * page/cocoa/MemoryReleaseCocoa.mm:
+        * page/cocoa/SettingsCocoa.mm:
+        * page/ios/UserAgentIOS.mm:
+        * platform/audio/ios/MediaSessionManagerIOS.mm:
+        * platform/graphics/ca/PlatformCALayer.cpp:
+        * platform/graphics/cocoa/FontCascadeCocoa.mm:
+        * platform/graphics/cocoa/GraphicsContext3DCocoa.mm:
+        * platform/graphics/opentype/OpenTypeCG.h:
+        * platform/graphics/win/SimpleFontDataCGWin.cpp:
+        * platform/graphics/win/SimpleFontDataDirect2D.cpp:
+        * platform/ios/Device.h:
+        * platform/ios/PlatformPasteboardIOS.mm:
+        * platform/ios/PlatformScreenIOS.mm:
+        * platform/ios/QuickLookSoftLink.h:
+        * platform/ios/QuickLookSoftLink.mm:
+        * platform/ios/ValidationBubbleIOS.mm:
+        * platform/ios/WebItemProviderPasteboard.mm:
+        * platform/network/ios/PreviewConverter.mm:
+        * platform/sql/SQLiteFileSystem.cpp:
+        * rendering/RenderThemeIOS.mm:
+
 2017-08-16  Tim Horton  <timothy_horton@apple.com>
 
         2-3% of main thread time under UTTypeCreatePreferredIdentifierForTag on wunderground map

diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
index 1638603a27e052f8028a4e452d218a4c6634db53..666fa642df9e76d81a86b393f7f69c14b60ee6b5 100644 (file)
--- a/Source/WebCore/PAL/ChangeLog
+++ b/Source/WebCore/PAL/ChangeLog
@@ -1,3 +1,23 @@
+2017-08-16  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [PAL] Move spi/ios and spi/win directories into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175171
+
+        Reviewed by Antti Koivisto.
+
+        * PAL.xcodeproj/project.pbxproj:
+        * pal/spi/ios/CoreUISPI.h: Renamed from Source/WebCore/platform/spi/ios/CoreUISPI.h.
+        * pal/spi/ios/DataDetectorsUISPI.h: Renamed from Source/WebCore/platform/spi/ios/DataDetectorsUISPI.h.
+        * pal/spi/ios/GraphicsServicesSPI.h: Renamed from Source/WebCore/platform/spi/ios/GraphicsServicesSPI.h.
+        * pal/spi/ios/LaunchServicesSPI.h: Renamed from Source/WebCore/platform/spi/ios/LaunchServicesSPI.h.
+        * pal/spi/ios/MediaPlayerSPI.h: Renamed from Source/WebCore/platform/spi/ios/MediaPlayerSPI.h.
+        * pal/spi/ios/MobileGestaltSPI.h: Renamed from Source/WebCore/platform/spi/ios/MobileGestaltSPI.h.
+        * pal/spi/ios/OpenGLESSPI.h: Renamed from Source/WebCore/platform/spi/ios/OpenGLESSPI.h.
+        * pal/spi/ios/QuickLookSPI.h: Renamed from Source/WebCore/platform/spi/ios/QuickLookSPI.h.
+        * pal/spi/ios/SQLite3SPI.h: Renamed from Source/WebCore/platform/spi/ios/SQLite3SPI.h.
+        * pal/spi/ios/UIKitSPI.h: Renamed from Source/WebCore/platform/spi/ios/UIKitSPI.h.
+        * pal/spi/win/CoreTextSPIWin.h: Renamed from Source/WebCore/platform/spi/win/CoreTextSPIWin.h.
+
 2017-08-16  Andy Estes  <aestes@apple.com>
 
         [Payment Request] Add an ENABLE flag and an experimental feature preference

diff --git a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
index 294481eef90015cb7cc8ff93f51b01eaedca6e3e..886b7709063f53a0883049d2cd0ebdc5fe00f2d5 100644 (file)
--- a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
+++ b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
@@ -58,6 +58,16 @@
                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 */; };
+               0C5AF9191F43A4C7002EAC02 /* CoreUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF90F1F43A4C7002EAC02 /* CoreUISPI.h */; };
+               0C5AF91A1F43A4C7002EAC02 /* DataDetectorsUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF9101F43A4C7002EAC02 /* DataDetectorsUISPI.h */; };
+               0C5AF91B1F43A4C7002EAC02 /* GraphicsServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF9111F43A4C7002EAC02 /* GraphicsServicesSPI.h */; };
+               0C5AF91C1F43A4C7002EAC02 /* LaunchServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF9121F43A4C7002EAC02 /* LaunchServicesSPI.h */; };
+               0C5AF91D1F43A4C7002EAC02 /* MediaPlayerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF9131F43A4C7002EAC02 /* MediaPlayerSPI.h */; };
+               0C5AF91E1F43A4C7002EAC02 /* MobileGestaltSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF9141F43A4C7002EAC02 /* MobileGestaltSPI.h */; };
+               0C5AF91F1F43A4C7002EAC02 /* OpenGLESSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF9151F43A4C7002EAC02 /* OpenGLESSPI.h */; };
+               0C5AF9201F43A4C7002EAC02 /* QuickLookSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF9161F43A4C7002EAC02 /* QuickLookSPI.h */; };
+               0C5AF9211F43A4C7002EAC02 /* SQLite3SPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF9171F43A4C7002EAC02 /* SQLite3SPI.h */; };
+               0C5AF9221F43A4C7002EAC02 /* UIKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5AF9181F43A4C7002EAC02 /* UIKitSPI.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 */; };
@@ -125,6 +135,16 @@
                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>"; };
+               0C5AF90F1F43A4C7002EAC02 /* CoreUISPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreUISPI.h; path = spi/ios/CoreUISPI.h; sourceTree = "<group>"; };
+               0C5AF9101F43A4C7002EAC02 /* DataDetectorsUISPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DataDetectorsUISPI.h; path = spi/ios/DataDetectorsUISPI.h; sourceTree = "<group>"; };
+               0C5AF9111F43A4C7002EAC02 /* GraphicsServicesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphicsServicesSPI.h; path = spi/ios/GraphicsServicesSPI.h; sourceTree = "<group>"; };
+               0C5AF9121F43A4C7002EAC02 /* LaunchServicesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LaunchServicesSPI.h; path = spi/ios/LaunchServicesSPI.h; sourceTree = "<group>"; };
+               0C5AF9131F43A4C7002EAC02 /* MediaPlayerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MediaPlayerSPI.h; path = spi/ios/MediaPlayerSPI.h; sourceTree = "<group>"; };
+               0C5AF9141F43A4C7002EAC02 /* MobileGestaltSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MobileGestaltSPI.h; path = spi/ios/MobileGestaltSPI.h; sourceTree = "<group>"; };
+               0C5AF9151F43A4C7002EAC02 /* OpenGLESSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenGLESSPI.h; path = spi/ios/OpenGLESSPI.h; sourceTree = "<group>"; };
+               0C5AF9161F43A4C7002EAC02 /* QuickLookSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuickLookSPI.h; path = spi/ios/QuickLookSPI.h; sourceTree = "<group>"; };
+               0C5AF9171F43A4C7002EAC02 /* SQLite3SPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SQLite3SPI.h; path = spi/ios/SQLite3SPI.h; sourceTree = "<group>"; };
+               0C5AF9181F43A4C7002EAC02 /* UIKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UIKitSPI.h; path = spi/ios/UIKitSPI.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>"; };
@@ -168,6 +188,7 @@
                                0C2DA0661F33CA3A00DBC317 /* cf */,
                                0C2DA11B1F3BE9D200DBC317 /* cg */,
                                0C2DA1201F3BE9E700DBC317 /* cocoa */,
+                               0C5AF90D1F43A4A4002EAC02 /* ios */,
                        );
                        name = spi;
                        sourceTree = "<group>";
@@ -229,6 +250,23 @@
                        name = cocoa;
                        sourceTree = "<group>";
                };
+               0C5AF90D1F43A4A4002EAC02 /* ios */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0C5AF90F1F43A4C7002EAC02 /* CoreUISPI.h */,
+                               0C5AF9101F43A4C7002EAC02 /* DataDetectorsUISPI.h */,
+                               0C5AF9111F43A4C7002EAC02 /* GraphicsServicesSPI.h */,
+                               0C5AF9121F43A4C7002EAC02 /* LaunchServicesSPI.h */,
+                               0C5AF9131F43A4C7002EAC02 /* MediaPlayerSPI.h */,
+                               0C5AF9141F43A4C7002EAC02 /* MobileGestaltSPI.h */,
+                               0C5AF9151F43A4C7002EAC02 /* OpenGLESSPI.h */,
+                               0C5AF9161F43A4C7002EAC02 /* QuickLookSPI.h */,
+                               0C5AF9171F43A4C7002EAC02 /* SQLite3SPI.h */,
+                               0C5AF9181F43A4C7002EAC02 /* UIKitSPI.h */,
+                       );
+                       name = ios;
+                       sourceTree = "<group>";
+               };
                1C09D0341E31C32800725F18 = {
                        isa = PBXGroup;
                        children = (
@@ -348,12 +386,9 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               A3AB6E561F3D1DDB009C14B1 /* SleepDisabler.h in Headers */,
-                               A3AB6E611F3D1E39009C14B1 /* SleepDisablerCocoa.h in Headers */,
                                0C2DA13E1F3BEB4900DBC317 /* AVKitSPI.h in Headers */,
                                0C2DA06D1F33CA8400DBC317 /* CFLocaleSPI.h in Headers */,
                                0C2DA06E1F33CA8400DBC317 /* CFNetworkConnectionCacheSPI.h in Headers */,
-                               A3AB6E641F3D217F009C14B1 /* SystemSleepListenerMac.h in Headers */,
                                0C2DA06F1F33CA8400DBC317 /* CFNetworkSPI.h in Headers */,
                                0C2DA13F1F3BEB4900DBC317 /* CFNSURLConnectionSPI.h in Headers */,
                                0C2DA0701F33CA8400DBC317 /* CFUtilitiesSPI.h in Headers */,
@@ -362,9 +397,12 @@
                                0C2DA11E1F3BE9E000DBC317 /* CoreGraphicsSPI.h in Headers */,
                                0C2DA0721F33CA8400DBC317 /* CoreMediaSPI.h in Headers */,
                                0C2DA1401F3BEB4900DBC317 /* CoreTextSPI.h in Headers */,
+                               0C5AF9191F43A4C7002EAC02 /* CoreUISPI.h in Headers */,
                                1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */,
                                0C2DA1411F3BEB4900DBC317 /* DataDetectorsCoreSPI.h in Headers */,
+                               0C5AF91A1F43A4C7002EAC02 /* DataDetectorsUISPI.h in Headers */,
                                0C2D9E731EEF5AF600DBC317 /* ExportMacros.h in Headers */,
+                               0C5AF91B1F43A4C7002EAC02 /* GraphicsServicesSPI.h in Headers */,
                                0C2DA11F1F3BE9E000DBC317 /* ImageIOSPI.h in Headers */,
                                0C2DA1421F3BEB4900DBC317 /* IOPMLibSPI.h in Headers */,
                                0C2DA1431F3BEB4900DBC317 /* IOPSLibSPI.h in Headers */,
@@ -372,8 +410,11 @@
                                0C2DA1451F3BEB4900DBC317 /* IOSurfaceSPI.h in Headers */,
                                0C2DA1461F3BEB4900DBC317 /* IOTypesSPI.h in Headers */,
                                A30D41211F0DD0EA00B71954 /* KillRing.h in Headers */,
+                               0C5AF91C1F43A4C7002EAC02 /* LaunchServicesSPI.h in Headers */,
                                0C2DA1471F3BEB4900DBC317 /* LinkPresentationSPI.h in Headers */,
                                0C2DA1481F3BEB4900DBC317 /* MachVMSPI.h in Headers */,
+                               0C5AF91D1F43A4C7002EAC02 /* MediaPlayerSPI.h in Headers */,
+                               0C5AF91E1F43A4C7002EAC02 /* MobileGestaltSPI.h in Headers */,
                                0C2DA1491F3BEB4900DBC317 /* NEFilterSourceSPI.h in Headers */,
                                0C2DA14A1F3BEB4900DBC317 /* NSAttributedStringSPI.h in Headers */,
                                0C2DA14B1F3BEB4900DBC317 /* NSButtonCellSPI.h in Headers */,
@@ -386,12 +427,19 @@
                                0C2DA1521F3BEB4900DBC317 /* NSURLConnectionSPI.h in Headers */,
                                0C2DA1531F3BEB4900DBC317 /* NSURLDownloadSPI.h in Headers */,
                                0C2DA1541F3BEB4900DBC317 /* NSURLFileTypeMappingsSPI.h in Headers */,
-                               A3AB6E581F3D1DDB009C14B1 /* SystemSleepListener.h in Headers */,
+                               0C5AF91F1F43A4C7002EAC02 /* OpenGLESSPI.h in Headers */,
                                0C2DA1551F3BEB4900DBC317 /* PassKitSPI.h in Headers */,
                                0C2DA1561F3BEB4900DBC317 /* pthreadSPI.h in Headers */,
                                0C2DA1571F3BEB4900DBC317 /* QuartzCoreSPI.h in Headers */,
+                               0C5AF9201F43A4C7002EAC02 /* QuickLookSPI.h in Headers */,
                                0C2DA1581F3BEB4900DBC317 /* ServersSPI.h in Headers */,
+                               A3AB6E561F3D1DDB009C14B1 /* SleepDisabler.h in Headers */,
+                               A3AB6E611F3D1E39009C14B1 /* SleepDisablerCocoa.h in Headers */,
                                A3788E981F05B6CE00679425 /* Sound.h in Headers */,
+                               0C5AF9211F43A4C7002EAC02 /* SQLite3SPI.h in Headers */,
+                               A3AB6E581F3D1DDB009C14B1 /* SystemSleepListener.h in Headers */,
+                               A3AB6E641F3D217F009C14B1 /* SystemSleepListenerMac.h in Headers */,
+                               0C5AF9221F43A4C7002EAC02 /* UIKitSPI.h in Headers */,
                                0C2DA1591F3BEB4900DBC317 /* WebFilterEvaluatorSPI.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
@@ -481,15 +529,15 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               A3AB6E651F3D217F009C14B1 /* SystemSleepListenerMac.mm in Sources */,
                                1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */,
-                               A3AB6E521F3D1DC5009C14B1 /* SleepDisabler.cpp in Sources */,
-                               A3AB6E601F3D1E39009C14B1 /* SleepDisablerCocoa.cpp in Sources */,
                                A30D41251F0DD12D00B71954 /* KillRingMac.mm in Sources */,
                                A30D41221F0DD0EA00B71954 /* KillRingNone.cpp in Sources */,
+                               A3AB6E521F3D1DC5009C14B1 /* SleepDisabler.cpp in Sources */,
+                               A3AB6E601F3D1E39009C14B1 /* SleepDisablerCocoa.cpp in Sources */,
                                A3788E9E1F05B78E00679425 /* SoundMac.mm in Sources */,
                                A3788E9C1F05B78200679425 /* SoundNone.cpp in Sources */,
                                A3AB6E571F3D1DDB009C14B1 /* SystemSleepListener.cpp in Sources */,
+                               A3AB6E651F3D217F009C14B1 /* SystemSleepListenerMac.mm in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

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

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

diff --git a/Source/WebCore/platform/spi/ios/GraphicsServicesSPI.h b/Source/WebCore/PAL/pal/spi/ios/GraphicsServicesSPI.h
similarity index 94%
rename from Source/WebCore/platform/spi/ios/GraphicsServicesSPI.h
rename to Source/WebCore/PAL/pal/spi/ios/GraphicsServicesSPI.h
index 192f879defcd5e54331768be3460f51fce823dd9..1b744fe8519f30f8836e7a4f4f2a501966468e5d 100644 (file)
--- a/Source/WebCore/platform/spi/ios/GraphicsServicesSPI.h
+++ b/Source/WebCore/PAL/pal/spi/ios/GraphicsServicesSPI.h
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GraphicsServicesSPI_h
-#define GraphicsServicesSPI_h
+#pragma once
 
 #import <wtf/Platform.h>
 
@@ -47,5 +46,3 @@ void GSFontPurgeFontCache(void);
 WTF_EXTERN_C_END
 
 #endif
-
-#endif // GraphicsServicesSPI_h

diff --git a/Source/WebCore/platform/spi/ios/LaunchServicesSPI.h b/Source/WebCore/PAL/pal/spi/ios/LaunchServicesSPI.h
similarity index 96%
rename from Source/WebCore/platform/spi/ios/LaunchServicesSPI.h
rename to Source/WebCore/PAL/pal/spi/ios/LaunchServicesSPI.h
index 0e3c9a19bd4976320be34f016378efbd7067de25..e6a8b2e4fcbee1511e8c0c43b7abd57852281823 100644 (file)
--- a/Source/WebCore/platform/spi/ios/LaunchServicesSPI.h
+++ b/Source/WebCore/PAL/pal/spi/ios/LaunchServicesSPI.h
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef LaunchServicesSPI_h
-#define LaunchServicesSPI_h
+#pragma once
 
 #import <Foundation/Foundation.h>
 
@@ -61,5 +60,3 @@ typedef void (^LSAppLinkOpenCompletionHandler)(BOOL success, NSError *error);
 @end
 
 #endif
-
-#endif // LaunchServicesSPI_h

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

diff --git a/Source/WebCore/platform/spi/ios/MobileGestaltSPI.h b/Source/WebCore/PAL/pal/spi/ios/MobileGestaltSPI.h
similarity index 97%
rename from Source/WebCore/platform/spi/ios/MobileGestaltSPI.h
rename to Source/WebCore/PAL/pal/spi/ios/MobileGestaltSPI.h
index 5b76f12c80e3d3e336b8ac38e19f7434e48820ee..0389d0539aa50d371bbe56c392feeb787a1b7aa5 100644 (file)
--- a/Source/WebCore/platform/spi/ios/MobileGestaltSPI.h
+++ b/Source/WebCore/PAL/pal/spi/ios/MobileGestaltSPI.h
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MobileGestaltSPI_h
-#define MobileGestaltSPI_h
+#pragma once
 
 #import <wtf/Platform.h>
 
@@ -78,5 +77,3 @@ Float32 MGGetFloat32Answer(CFStringRef question, Float32 defaultValue);
 WTF_EXTERN_C_END
 
 #endif
-
-#endif // MobileGestaltSPI_h

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

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

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

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

diff --git a/Source/WebCore/platform/spi/win/CoreTextSPIWin.h b/Source/WebCore/PAL/pal/spi/win/CoreTextSPIWin.h
similarity index 98%
rename from Source/WebCore/platform/spi/win/CoreTextSPIWin.h
rename to Source/WebCore/PAL/pal/spi/win/CoreTextSPIWin.h
index e0a0567229743765c6cd8f28706d7e6969abc136..31dcf70c6085398a3da29143e8301c2dd0e998e6 100644 (file)
--- a/Source/WebCore/platform/spi/win/CoreTextSPIWin.h
+++ b/Source/WebCore/PAL/pal/spi/win/CoreTextSPIWin.h
@@ -45,8 +45,7 @@ CT_EXPORT const CFStringRef kCTStrokeColorAttributeName;
 
 // This enum is defined in CTFont.h. To avoid redefinition, only define it here if CTFont.h has not been included. 
 #ifndef __CTFONT__
-typedef CF_OPTIONS(uint32_t, CTFontTableOptions)
-{
+typedef CF_OPTIONS(uint32_t, CTFontTableOptions) {
     kCTFontTableOptionNoOptions = 0,
     kCTFontTableOptionExcludeSynthetic = (1 << 0)
 };

diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
index fbd3d5beb7d7bf3d0ec473175e9025bc62b53cd9..ddc8172b229c2ca82c75b2255b5daec5f78bff7a 100644 (file)
--- a/Source/WebCore/PlatformWin.cmake
+++ b/Source/WebCore/PlatformWin.cmake
@@ -35,7 +35,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/graphics/opentype"
     "${WEBCORE_DIR}/platform/graphics/win"
     "${WEBCORE_DIR}/platform/network/win"
-    "${WEBCORE_DIR}/platform/spi/win"
     "${WEBCORE_DIR}/platform/win"
     "${THIRDPARTY_DIR}/ANGLE/include"
     "${THIRDPARTY_DIR}/ANGLE/include/egl"

diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index af2aef01ee844df03f1ef4049c07853467513571..c21aac894e0c80d477391c1e9e1daa07620598e6 100644 (file)
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1266,7 +1266,6 @@
                2DAF343C1EA7E0F100382CD3 /* ConstantPropertyMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DAF343A1EA7E0F100382CD3 /* ConstantPropertyMap.cpp */; };
                2DAF343D1EA7E0F100382CD3 /* ConstantPropertyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DAF343B1EA7E0F100382CD3 /* ConstantPropertyMap.h */; };
                2DB9C4AA1B3231F40070F27F /* NSEventSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DB9C4A91B3231F40070F27F /* NSEventSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               2DC4CF791D2DD98900ECCC94 /* DataDetectorsUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DC4CF781D2DD98900ECCC94 /* DataDetectorsUISPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                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, ); }; };
@@ -1545,7 +1544,6 @@
                31C0FF3E0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 31C0FF3A0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.h */; };
                31C0FF3F0E4CEFAC007D6FE5 /* JSWebKitTransitionEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31C0FF3B0E4CEFAC007D6FE5 /* JSWebKitTransitionEvent.cpp */; };
                31C0FF400E4CEFAC007D6FE5 /* JSWebKitTransitionEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 31C0FF3C0E4CEFAC007D6FE5 /* JSWebKitTransitionEvent.h */; };
-               31CBAF6C1F19868500849F73 /* SQLite3SPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 31AA003F1EF44829009DFC06 /* SQLite3SPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                31D591B316697A6C00E6BF02 /* PlugInClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 31D591B116697A6C00E6BF02 /* PlugInClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                31DCD29D1AB4FBDE0072E817 /* AnimationTrigger.h in Headers */ = {isa = PBXBuildFile; fileRef = 31DCD29C1AB4FBDE0072E817 /* AnimationTrigger.h */; settings = {ATTRIBUTES = (Private, ); }; };
                31DCDF431DA1C45400EA5B93 /* ExtendedColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31DCDF411DA1C45400EA5B93 /* ExtendedColor.cpp */; };
@@ -3177,7 +3175,6 @@
                7C4C96DE1AD4483500365A50 /* JSReadableStreamDefaultReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4C96DA1AD4483500365A50 /* JSReadableStreamDefaultReader.cpp */; };
                7C4C96DF1AD4483500363572 /* JSReadableStreamBYOBReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4C96DB1AD4483500363572 /* JSReadableStreamBYOBReader.h */; };
                7C4C96DF1AD4483500365A50 /* JSReadableStreamDefaultReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4C96DB1AD4483500365A50 /* JSReadableStreamDefaultReader.h */; };
-               7C4C96E31AD44ABF00365A50 /* LaunchServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4C96E21AD44ABF00365A50 /* LaunchServicesSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7C4EDD741A7B607800198C4D /* FontCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C4EDD731A7B607800198C4D /* FontCocoa.mm */; };
                7C516AD41F3525200034B6BF /* DOMPromiseProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C516AD21F3525200034B6BF /* DOMPromiseProxy.h */; };
                7C5222961E1DAE03002CB8F7 /* IDLTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C5222951E1DADF8002CB8F7 /* IDLTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -4370,7 +4367,6 @@
                A1E1154813015C5D0054AC8C /* SpotLightSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1E1154713015C5D0054AC8C /* SpotLightSource.cpp */; };
                A1ED778C1BE3294000DC1791 /* Device.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1ED778A1BE3293F00DC1791 /* Device.cpp */; };
                A1ED778D1BE3294000DC1791 /* Device.h in Headers */ = {isa = PBXBuildFile; fileRef = A1ED778B1BE3294000DC1791 /* Device.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               A1ED778F1BE4291800DC1791 /* UIKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A1ED778E1BE4291800DC1791 /* UIKitSPI.h */; };
                A1F78D0C1C25424C00245446 /* ResourceResponseCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1F78D0B1C25422C00245446 /* ResourceResponseCocoa.mm */; };
                A2B9217316C5CC420041DCD9 /* IntRectExtent.h in Headers */ = {isa = PBXBuildFile; fileRef = A2B9217216C5CC420041DCD9 /* IntRectExtent.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A31C4E4D16E02AA6002F7957 /* OESTextureHalfFloat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A31C4E4C16E02AA6002F7957 /* OESTextureHalfFloat.cpp */; };
@@ -6350,10 +6346,6 @@
                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 = (); }; };
-               CE1252391A166FA000864480 /* QuickLookSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252381A166FA000864480 /* QuickLookSPI.h */; };
-               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, ); }; };
                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 */; };
@@ -6374,7 +6366,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, ); }; };
-               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, ); }; };
                CECADFC8153778FF00E37068 /* DictationCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CECADFC4153778FF00E37068 /* DictationCommand.cpp */; };
@@ -8852,7 +8843,6 @@
                2DAF343A1EA7E0F100382CD3 /* ConstantPropertyMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConstantPropertyMap.cpp; sourceTree = "<group>"; };
                2DAF343B1EA7E0F100382CD3 /* ConstantPropertyMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConstantPropertyMap.h; sourceTree = "<group>"; };
                2DB9C4A91B3231F40070F27F /* NSEventSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSEventSPI.h; sourceTree = "<group>"; };
-               2DC4CF781D2DD98900ECCC94 /* DataDetectorsUISPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataDetectorsUISPI.h; sourceTree = "<group>"; };
                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>"; };
@@ -9187,7 +9177,6 @@
                31A795C31888B72400382F90 /* ANGLEInstancedArrays.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ANGLEInstancedArrays.idl; sourceTree = "<group>"; };
                31A795C41888BAD100382F90 /* JSANGLEInstancedArrays.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSANGLEInstancedArrays.cpp; sourceTree = "<group>"; };
                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>"; };
                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>"; };
@@ -10813,7 +10802,6 @@
                6F995A2E1A70833700A735F4 /* JSWebGLTransformFeedback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLTransformFeedback.h; sourceTree = "<group>"; };
                6F995A2F1A70833700A735F4 /* JSWebGLVertexArrayObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLVertexArrayObject.cpp; sourceTree = "<group>"; };
                6F995A301A70833700A735F4 /* JSWebGLVertexArrayObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLVertexArrayObject.h; sourceTree = "<group>"; };
-               6FAD4A561A9D0FAE009F7D3C /* OpenGLESSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenGLESSPI.h; sourceTree = "<group>"; };
                709A01FD1E3D0BCC006B0D4C /* ModuleFetchFailureKind.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModuleFetchFailureKind.h; sourceTree = "<group>"; };
                71004B9D1DC1398800A52A38 /* playback-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "playback-support.js"; sourceTree = "<group>"; };
                710FA74B1DEE576D004C715E /* controls-bar.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "controls-bar.js"; sourceTree = "<group>"; };
@@ -11244,7 +11232,6 @@
                7C4C96DA1AD4483500365A50 /* JSReadableStreamDefaultReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStreamDefaultReader.cpp; sourceTree = "<group>"; };
                7C4C96DB1AD4483500363572 /* JSReadableStreamBYOBReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSReadableStreamBYOBReader.h; sourceTree = "<group>"; };
                7C4C96DB1AD4483500365A50 /* JSReadableStreamDefaultReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSReadableStreamDefaultReader.h; sourceTree = "<group>"; };
-               7C4C96E21AD44ABF00365A50 /* LaunchServicesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LaunchServicesSPI.h; sourceTree = "<group>"; };
                7C4EDD731A7B607800198C4D /* FontCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FontCocoa.mm; sourceTree = "<group>"; };
                7C516AD21F3525200034B6BF /* DOMPromiseProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DOMPromiseProxy.h; sourceTree = "<group>"; };
                7C5222951E1DADF8002CB8F7 /* IDLTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDLTypes.h; sourceTree = "<group>"; };
@@ -12656,7 +12643,6 @@
                A1E1154713015C5D0054AC8C /* SpotLightSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpotLightSource.cpp; sourceTree = "<group>"; };
                A1ED778A1BE3293F00DC1791 /* Device.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Device.cpp; sourceTree = "<group>"; };
                A1ED778B1BE3294000DC1791 /* Device.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Device.h; sourceTree = "<group>"; };
-               A1ED778E1BE4291800DC1791 /* UIKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIKitSPI.h; sourceTree = "<group>"; };
                A1F78D0B1C25422C00245446 /* ResourceResponseCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceResponseCocoa.mm; sourceTree = "<group>"; };
                A208E222A56A0C7575F2A72E /* RenderMathMLMenclose.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMathMLMenclose.h; sourceTree = "<group>"; };
                A2B9217216C5CC420041DCD9 /* IntRectExtent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntRectExtent.h; sourceTree = "<group>"; };
@@ -14943,10 +14929,6 @@
                CE057FA41220731100A476D5 /* DocumentMarkerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentMarkerController.h; sourceTree = "<group>"; };
                CE08C3CF152B599A0021B8C2 /* AlternativeTextController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AlternativeTextController.cpp; sourceTree = "<group>"; };
                CE08C3D0152B599A0021B8C2 /* AlternativeTextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlternativeTextController.h; sourceTree = "<group>"; };
-               CE1252381A166FA000864480 /* QuickLookSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookSPI.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>"; };
                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>"; };
@@ -14969,7 +14951,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>"; };
-               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>"; };
                CECADFC4153778FF00E37068 /* DictationCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DictationCommand.cpp; sourceTree = "<group>"; };
@@ -18903,7 +18884,6 @@
                653EF83619A043AE0052202C /* spi */ = {
                        isa = PBXGroup;
                        children = (
-                               A172182419DE182B00464D17 /* ios */,
                                9348428019F1A9190009D5AE /* mac */,
                        );
                        path = spi;
@@ -21138,23 +21118,6 @@
                        path = ios;
                        sourceTree = "<group>";
                };
-               A172182419DE182B00464D17 /* ios */ = {
-                       isa = PBXGroup;
-                       children = (
-                               CE1252421A16C01A00864480 /* CoreUISPI.h */,
-                               2DC4CF781D2DD98900ECCC94 /* DataDetectorsUISPI.h */,
-                               CEC337AE1A46086D009B8523 /* GraphicsServicesSPI.h */,
-                               7C4C96E21AD44ABF00365A50 /* LaunchServicesSPI.h */,
-                               CE1252401A16B1B600864480 /* MediaPlayerSPI.h */,
-                               CE1252481A16C3BC00864480 /* MobileGestaltSPI.h */,
-                               6FAD4A561A9D0FAE009F7D3C /* OpenGLESSPI.h */,
-                               CE1252381A166FA000864480 /* QuickLookSPI.h */,
-                               31AA003F1EF44829009DFC06 /* SQLite3SPI.h */,
-                               A1ED778E1BE4291800DC1791 /* UIKitSPI.h */,
-                       );
-                       path = ios;
-                       sourceTree = "<group>";
-               };
                A1763F3B1E2051AB001D58DE /* cocoa */ = {
                        isa = PBXGroup;
                        children = (
@@ -26900,7 +26863,6 @@
                                3F8020371E9E47C500DEC61D /* CoreAudioCaptureDeviceManager.h in Headers */,
                                07AFF4221EFB144900B545B3 /* CoreAudioCaptureSourceIOS.h in Headers */,
                                443818001A91B2F8006E04F2 /* CoreMediaSoftLink.h in Headers */,
-                               CE1252431A16C01A00864480 /* CoreUISPI.h in Headers */,
                                CD7D33481C7A16BF00041293 /* CoreVideoSoftLink.h in Headers */,
                                862F129E18C1576F005C54AF /* CountedUserActivity.h in Headers */,
                                A80E6D040A1989CA007FB8C5 /* Counter.h in Headers */,
@@ -27116,7 +27078,6 @@
                                C5227DF11C3C6DF100F5ED54 /* DataDetection.h in Headers */,
                                7C7941E51C56C29300A4C58E /* DataDetectorsCoreSoftLink.h in Headers */,
                                2D59F1BF1A0044C6001F3D29 /* DataDetectorsSPI.h in Headers */,
-                               2DC4CF791D2DD98900ECCC94 /* DataDetectorsUISPI.h in Headers */,
                                BC22746F0E83664500E7F975 /* DataRef.h in Headers */,
                                BC64641C11D7F416006455B0 /* DatasetDOMStringMap.h in Headers */,
                                85031B3E0A44EFC700F992E0 /* DataTransfer.h in Headers */,
@@ -27513,7 +27474,6 @@
                                0F580B0E0F12A2690051D689 /* GraphicsLayerClient.h in Headers */,
                                1AC69593161A1E53003732CB /* GraphicsLayerFactory.h in Headers */,
                                0FA24D7A162DF91900A3F4C0 /* GraphicsLayerUpdater.h in Headers */,
-                               CEC337AF1A46086D009B8523 /* GraphicsServicesSPI.h in Headers */,
                                B2A015AB0AF6CD53006BCE0E /* GraphicsTypes.h in Headers */,
                                77A17A7B12F2890B004E02F6 /* GraphicsTypes3D.h in Headers */,
                                E112F4721E3A861600D6CDFD /* Grid.h in Headers */,
@@ -28606,7 +28566,6 @@
                                450CEBF115073BBE002BB149 /* LabelableElement.h in Headers */,
                                A456FA2711AD4A830020B420 /* LabelsNodeList.h in Headers */,
                                85EC9AFB0A71A2C600EEEAED /* Language.h in Headers */,
-                               7C4C96E31AD44ABF00365A50 /* LaunchServicesSPI.h in Headers */,
                                2917B5621473496C0052C9D0 /* LayerFlushScheduler.h in Headers */,
                                2917B5631473496C0052C9D0 /* LayerFlushSchedulerClient.h in Headers */,
                                E4916FF7195DF6A0005AB349 /* LayerFlushThrottleState.h in Headers */,
@@ -28747,7 +28706,6 @@
                                CDC8B5A3180463470016E685 /* MediaPlayerPrivateMediaSourceAVFObjC.h in Headers */,
                                150524F41B712FF600696AA9 /* MediaPlayerPrivateMediaStreamAVFObjC.h in Headers */,
                                E44613E60CD681A900FADA75 /* MediaPlayerPrivateQTKit.h in Headers */,
-                               CE1252411A16B1B600864480 /* MediaPlayerSPI.h in Headers */,
                                52E2CAFC19FF0207001EEB4F /* MediaProducer.h in Headers */,
                                4E19592A0A39DACC00220FE5 /* MediaQuery.h in Headers */,
                                9493B6BF1D74B4120088E780 /* MediaQueryBlockWatcher.h in Headers */,
@@ -28809,7 +28767,6 @@
                                53B895AF19DC7ED9009CAA93 /* Microtasks.h in Headers */,
                                BC772C4F0C4EB3040083285F /* MIMETypeRegistry.h in Headers */,
                                52F10866162B6DA8009AC81E /* MixedContentChecker.h in Headers */,
-                               CE1252491A16C3BC00864480 /* MobileGestaltSPI.h in Headers */,
                                CDF2B0111820540600F2B424 /* MockBox.h in Headers */,
                                CDF4B7241E03BF8100E235A2 /* MockCDMFactory.h in Headers */,
                                CDF4B7201E03BF6F00E235A2 /* MockCDMFactory.idl in Headers */,
@@ -29110,7 +29067,6 @@
                                A15E31F41E0CB0B5004B371C /* QuickLook.h in Headers */,
                                937F4CCC1A2D48C100BB39F5 /* QuickLookMacSPI.h in Headers */,
                                443918001A91B2F8006E04F2 /* QuickLookSoftLink.h in Headers */,
-                               CE1252391A166FA000864480 /* QuickLookSPI.h in Headers */,
                                072AE1E8183C0741000A5988 /* QuickTimePluginReplacement.h in Headers */,
                                379E371713736A6600B9E919 /* QuotedPrintable.h in Headers */,
                                5A574F29131DB96D00471B88 /* QuotesData.h in Headers */,
@@ -29550,7 +29506,6 @@
                                7C83DE861D04CC5D00FEBCF3 /* SpringSolver.h in Headers */,
                                97BC6A3B1505F081001B74AC /* SQLCallbackWrapper.h in Headers */,
                                97BC6A3C1505F081001B74AC /* SQLError.h in Headers */,
-                               31CBAF6C1F19868500849F73 /* SQLite3SPI.h in Headers */,
                                1A22464A0CC98DDB00C05240 /* SQLiteDatabase.h in Headers */,
                                7E474E1F12494DC900235364 /* SQLiteDatabaseTracker.h in Headers */,
                                7E474E1E12494DC900235364 /* SQLiteDatabaseTrackerClient.h in Headers */,
@@ -30021,7 +29976,6 @@
                                85031B4E0A44EFC700F992E0 /* UIEvent.h in Headers */,
                                83FE7CA71DA9F1A70037237C /* UIEventInit.h in Headers */,
                                85031B4F0A44EFC700F992E0 /* UIEventWithKeyState.h in Headers */,
-                               A1ED778F1BE4291800DC1791 /* UIKitSPI.h in Headers */,
                                9B2D8A7914997CCF00ECEF3E /* UndoStep.h in Headers */,
                                A863E2011343412000274926 /* UnicodeBidi.h in Headers */,
                                518864E11BBAF57400E540C9 /* UniqueIDBDatabase.h in Headers */,

diff --git a/Source/WebCore/editing/cocoa/DataDetection.mm b/Source/WebCore/editing/cocoa/DataDetection.mm
index 8bcf3fe7251003497fea28285a7de5bb5981b27f..74aac5cd8a16b6c944e0d5b1a28d388d69bb455e 100644 (file)
--- a/Source/WebCore/editing/cocoa/DataDetection.mm
+++ b/Source/WebCore/editing/cocoa/DataDetection.mm
@@ -31,7 +31,6 @@
 #import "Attr.h"
 #import "CSSStyleDeclaration.h"
 #import "DataDetectorsSPI.h"
-#import "DataDetectorsUISPI.h"
 #import "Editing.h"
 #import "ElementAncestorIterator.h"
 #import "ElementTraversal.h"
@@ -50,6 +49,7 @@
 #import "TextIterator.h"
 #import "VisiblePosition.h"
 #import "VisibleUnits.h"
+#import <pal/spi/ios/DataDetectorsUISPI.h>
 #import <wtf/text/StringBuilder.h>
 
 #import "DataDetectorsCoreSoftLink.h"

diff --git a/Source/WebCore/loader/ios/PreviewLoader.mm b/Source/WebCore/loader/ios/PreviewLoader.mm
index 8e4ea423960c1266cde240a3d6fb55d8c3725ce8..592b0ca3046cbdf54d5b37f6a47bebf8d59bb0d6 100644 (file)
--- a/Source/WebCore/loader/ios/PreviewLoader.mm
+++ b/Source/WebCore/loader/ios/PreviewLoader.mm
@@ -35,8 +35,8 @@
 #import "PreviewConverter.h"
 #import "PreviewLoaderClient.h"
 #import "QuickLook.h"
-#import "QuickLookSPI.h"
 #import "ResourceLoader.h"
+#import <pal/spi/ios/QuickLookSPI.h>
 #import <wtf/NeverDestroyed.h>
 
 using namespace WebCore;

diff --git a/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp b/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp
index 6d3765f85725ddbfaac7f48fd697e41bd7e2d2fc..f0b8f7f27d0da969bb6d1430c04f870e567a3f6c 100644 (file)
--- a/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp
+++ b/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp
@@ -33,7 +33,7 @@
 
 #include "AudioTrackList.h"
 #if PLATFORM(WIN)
-#include "CoreTextSPIWin.h"
+#include <pal/spi/win/CoreTextSPIWin.h>
 #endif
 #include "FloatConversion.h"
 #include "HTMLMediaElement.h"

diff --git a/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm b/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm
index 21b204f59ddb296b7f8d9fa2816aeeec98aa0499..09bc006e401fac8c6aede92df38c73d03c8448c2 100644 (file)
--- a/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm
+++ b/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm
@@ -27,10 +27,10 @@
 #include "MemoryRelease.h"
 
 #import "GCController.h"
-#import "GraphicsServicesSPI.h"
 #import "IOSurfacePool.h"
 #import "LayerPool.h"
 #import <notify.h>
+#import <pal/spi/ios/GraphicsServicesSPI.h>
 
 #if PLATFORM(IOS)
 #import "LegacyTileCache.h"

diff --git a/Source/WebCore/page/cocoa/SettingsCocoa.mm b/Source/WebCore/page/cocoa/SettingsCocoa.mm
index ca14e319852bdd914e3a379f7c721c5df8937b2d..9186bf81feed40b50e243568856b27e742009cad 100644 (file)
--- a/Source/WebCore/page/cocoa/SettingsCocoa.mm
+++ b/Source/WebCore/page/cocoa/SettingsCocoa.mm
@@ -30,7 +30,7 @@
 
 #if PLATFORM(IOS)
 #include "Device.h"
-#include "UIKitSPI.h"
+#include <pal/spi/ios/UIKitSPI.h>
 #include <wtf/SoftLinking.h>
 #endif
 

diff --git a/Source/WebCore/page/ios/UserAgentIOS.mm b/Source/WebCore/page/ios/UserAgentIOS.mm
index cbc61a18a962e5a8de3a425c9103254726310a98..f0948f68e50e92d03cc1a75fe94fde38eb79892d 100644 (file)
--- a/Source/WebCore/page/ios/UserAgentIOS.mm
+++ b/Source/WebCore/page/ios/UserAgentIOS.mm
@@ -27,10 +27,10 @@
 #import "UserAgent.h"
 
 #import "Device.h"
-#import "MobileGestaltSPI.h"
 #import "SystemVersion.h"
-#import "UIKitSPI.h"
 #import "WebCoreSystemInterface.h"
+#import <pal/spi/ios/MobileGestaltSPI.h>
+#import <pal/spi/ios/UIKitSPI.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/SoftLinking.h>
 

diff --git a/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm b/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm
index 1ddf0f55c9c969b245d32c691954b80fb9f23eab..91be5962ed85f28bf7d5462f1dac163b601b6a0b 100644 (file)
--- a/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm
+++ b/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm
@@ -30,7 +30,6 @@
 
 #import "Logging.h"
 #import "MediaPlayer.h"
-#import "MediaPlayerSPI.h"
 #import "PlatformMediaSession.h"
 #import "SystemMemory.h"
 #import "WebCoreThreadRun.h"
@@ -40,6 +39,7 @@
 #import <MediaPlayer/MPVolumeView.h>
 #import <UIKit/UIApplication.h>
 #import <objc/runtime.h>
+#import <pal/spi/ios/MediaPlayerSPI.h>
 #import <wtf/MainThread.h>
 #import <wtf/RAMSize.h>
 #import <wtf/RetainPtr.h>

diff --git a/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp b/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp
index da2ba9b4ae8eee5c2a9a22f6a77fb9e90452a67d..27ceed2e7117d81dc085419c739ecf8a2c9ea212 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp
+++ b/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp
@@ -37,7 +37,7 @@
 #include <wtf/text/TextStream.h>
 
 #if PLATFORM(WIN)
-#include "CoreTextSPIWin.h"
+#include <pal/spi/win/CoreTextSPIWin.h>
 #endif
 
 namespace WebCore {

diff --git a/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm b/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm
index fa83778ca2fec0b564d47a6ea27f91b765268e61..ae846a01ed42e5bb03d8197669f47eb4be3544bd 100644 (file)
--- a/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm
+++ b/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm
@@ -39,7 +39,7 @@
 #import <wtf/MathExtras.h>
 
 #if ENABLE(LETTERPRESS)
-#import "CoreUISPI.h"
+#import <pal/spi/ios/CoreUISPI.h>
 #import <wtf/SoftLinking.h>
 
 SOFT_LINK_PRIVATE_FRAMEWORK(CoreUI)

diff --git a/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm b/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm
index a5a6cd4ab1e10ade508064d382efa6a523a3bdbe..13257815ba09f33cb873d1199ba5e27cf5f6b439 100644 (file)
--- a/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm
+++ b/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm
@@ -48,11 +48,11 @@
 #import <wtf/text/CString.h>
 
 #if PLATFORM(IOS)
-#import "OpenGLESSPI.h"
 #import <OpenGLES/EAGL.h>
 #import <OpenGLES/EAGLDrawable.h>
 #import <OpenGLES/ES2/glext.h>
 #import <QuartzCore/QuartzCore.h>
+#import <pal/spi/ios/OpenGLESSPI.h>
 #else
 #import <IOKit/IOKitLib.h>
 #import <OpenGL/CGLRenderers.h>

diff --git a/Source/WebCore/platform/graphics/opentype/OpenTypeCG.h b/Source/WebCore/platform/graphics/opentype/OpenTypeCG.h
index 975cdaf052b460027385ad66991960399bb0173c..c5330bba77db1fba8f90adcce13d3c199b8a4fcb 100644 (file)
--- a/Source/WebCore/platform/graphics/opentype/OpenTypeCG.h
+++ b/Source/WebCore/platform/graphics/opentype/OpenTypeCG.h
@@ -30,7 +30,7 @@
 #include <CoreText/CoreText.h>
 
 #if PLATFORM(WIN)
-#include "CoreTextSPIWin.h"
+#include <pal/spi/win/CoreTextSPIWin.h>
 #endif
 
 namespace WebCore {

diff --git a/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp b/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp
index 6395ee7dbd7a4b4823c41d64d5ebe9139abf2755..2bd4b121e310246c8505a990c9414f3a089c6506 100644 (file)
--- a/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp
+++ b/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp
@@ -31,7 +31,6 @@
 
 #if USE(CG)
 
-#include "CoreTextSPIWin.h"
 #include "FloatRect.h"
 #include "FontCache.h"
 #include "FontDescription.h"
@@ -41,6 +40,7 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #include <mlang.h>
+#include <pal/spi/win/CoreTextSPIWin.h>
 #include <unicode/uchar.h>
 #include <unicode/unorm.h>
 #include <winsock2.h>

diff --git a/Source/WebCore/platform/graphics/win/SimpleFontDataDirect2D.cpp b/Source/WebCore/platform/graphics/win/SimpleFontDataDirect2D.cpp
index ee36b5ab957ae2bf34d80f5eb0549fcb338d8668..93af571ddb5a3ef81a06218fc54db789cc34006c 100644 (file)
--- a/Source/WebCore/platform/graphics/win/SimpleFontDataDirect2D.cpp
+++ b/Source/WebCore/platform/graphics/win/SimpleFontDataDirect2D.cpp
@@ -28,7 +28,6 @@
 
 #if USE(DIRECT2D)
 
-#include "CoreTextSPIWin.h"
 #include "FloatRect.h"
 #include "FontCache.h"
 #include "FontDescription.h"
@@ -38,6 +37,7 @@
 #include <comutil.h>
 #include <dwrite.h>
 #include <mlang.h>
+#include <pal/spi/win/CoreTextSPIWin.h>
 #include <unicode/uchar.h>
 #include <unicode/unorm.h>
 #include <winsock2.h>

diff --git a/Source/WebCore/platform/ios/Device.h b/Source/WebCore/platform/ios/Device.h
index e08cbd14a08bc40b0b205a0a50819a0b38b889ed..34809199af937f878db8a1e5fad3c4a9b9d99565 100644 (file)
--- a/Source/WebCore/platform/ios/Device.h
+++ b/Source/WebCore/platform/ios/Device.h
@@ -28,7 +28,7 @@
 
 #if PLATFORM(IOS)
 
-#include "MobileGestaltSPI.h"
+#include <pal/spi/ios/MobileGestaltSPI.h>
 
 namespace WTF {
 class String;

diff --git a/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm b/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm
index 1ed9229b29a5a146a8ba152560b3f4424e464e90..d66fec389d21d73aef90479599d9339377897753 100644 (file)
--- a/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm
+++ b/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm
@@ -30,12 +30,12 @@
 #import "Image.h"
 #import "Pasteboard.h"
 #import "SharedBuffer.h"
-#import "UIKitSPI.h"
 #import "URL.h"
 #import "WebItemProviderPasteboard.h"
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <UIKit/UIImage.h>
 #import <UIKit/UIPasteboard.h>
+#import <pal/spi/ios/UIKitSPI.h>
 #import <wtf/SoftLinking.h>
 
 SOFT_LINK_FRAMEWORK(UIKit)

diff --git a/Source/WebCore/platform/ios/PlatformScreenIOS.mm b/Source/WebCore/platform/ios/PlatformScreenIOS.mm
index 7d92e2809fa8cb11eef4f7736a6db90743f768fa..b07797da02fb6a6f51ee94ade0b6dbd09e1b7b68 100644 (file)
--- a/Source/WebCore/platform/ios/PlatformScreenIOS.mm
+++ b/Source/WebCore/platform/ios/PlatformScreenIOS.mm
@@ -32,11 +32,11 @@
 #import "FrameView.h"
 #import "HostWindow.h"
 #import "IntRect.h"
-#import "MobileGestaltSPI.h"
-#import "UIKitSPI.h"
 #import "WAKWindow.h"
 #import "WebCoreSystemInterface.h"
 #import "Widget.h"
+#import <pal/spi/ios/MobileGestaltSPI.h>
+#import <pal/spi/ios/UIKitSPI.h>
 #import <wtf/SoftLinking.h>
 
 SOFT_LINK_FRAMEWORK_FOR_SOURCE(WebCore, UIKit)

diff --git a/Source/WebCore/platform/ios/QuickLookSoftLink.h b/Source/WebCore/platform/ios/QuickLookSoftLink.h
index d798dcc0bd74a1b8837dd7b86ad767fd3ce3c5f8..26fe261a3e46ecb843bd8fda81b64a4770f6dc89 100644 (file)
--- a/Source/WebCore/platform/ios/QuickLookSoftLink.h
+++ b/Source/WebCore/platform/ios/QuickLookSoftLink.h
@@ -24,7 +24,7 @@
 
 #if USE(QUICK_LOOK)
 
-#include "QuickLookSPI.h"
+#include <pal/spi/ios/QuickLookSPI.h>
 #include <wtf/SoftLinking.h>
 
 SOFT_LINK_FRAMEWORK_FOR_HEADER(WebCore, QuickLook)

diff --git a/Source/WebCore/platform/ios/QuickLookSoftLink.mm b/Source/WebCore/platform/ios/QuickLookSoftLink.mm
index 67d3066947d05c1396d87f80d611750e4bd47a8d..4237bd316e7abd37e0066773644abb2512419b0e 100644 (file)
--- a/Source/WebCore/platform/ios/QuickLookSoftLink.mm
+++ b/Source/WebCore/platform/ios/QuickLookSoftLink.mm
@@ -26,7 +26,7 @@
 
 #if USE(QUICK_LOOK)
 
-#import "QuickLookSPI.h"
+#import <pal/spi/ios/QuickLookSPI.h>
 #import <wtf/SoftLinking.h>
 
 SOFT_LINK_FRAMEWORK_FOR_SOURCE(WebCore, QuickLook)

diff --git a/Source/WebCore/platform/ios/ValidationBubbleIOS.mm b/Source/WebCore/platform/ios/ValidationBubbleIOS.mm
index 8aa93e0ec52febf152dfe7454b968a6ed201142d..ebd371eb84d1445da1404c18db435f1358c5b259 100644 (file)
--- a/Source/WebCore/platform/ios/ValidationBubbleIOS.mm
+++ b/Source/WebCore/platform/ios/ValidationBubbleIOS.mm
@@ -28,7 +28,7 @@
 #if PLATFORM(IOS)
 #import "ValidationBubble.h"
 
-#import "UIKitSPI.h"
+#import <pal/spi/ios/UIKitSPI.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/SoftLinking.h>
 #import <wtf/text/WTFString.h>

diff --git a/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm b/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm
index 05cbc188b092a12df41cdc1bea86abd704ba5c00..8ae4d1fc2179dd092ccefb744c42bc2189e2daf0 100644 (file)
--- a/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm
+++ b/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm
@@ -28,13 +28,13 @@
 
 #if ENABLE(DATA_INTERACTION)
 
-#import "UIKitSPI.h"
 #import <Foundation/NSProgress.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <UIKit/UIColor.h>
 #import <UIKit/UIImage.h>
 #import <WebCore/FileSystemIOS.h>
 #import <WebCore/Pasteboard.h>
+#import <pal/spi/ios/UIKitSPI.h>
 #import <wtf/BlockPtr.h>
 #import <wtf/OSObjectPtr.h>
 #import <wtf/RetainPtr.h>

diff --git a/Source/WebCore/platform/network/ios/PreviewConverter.mm b/Source/WebCore/platform/network/ios/PreviewConverter.mm
index f8fd75f5f492960e362f1f5df23510ff67c8bec7..3e4eaa0666f30e1a4a8a3946717258d58b8d1946 100644 (file)
--- a/Source/WebCore/platform/network/ios/PreviewConverter.mm
+++ b/Source/WebCore/platform/network/ios/PreviewConverter.mm
@@ -28,9 +28,9 @@
 
 #if USE(QUICK_LOOK)
 
-#import "QuickLookSPI.h"
 #import "ResourceRequest.h"
 #import "ResourceResponse.h"
+#import <pal/spi/ios/QuickLookSPI.h>
 #import <wtf/SoftLinking.h>
 
 SOFT_LINK_FRAMEWORK(QuickLook);

diff --git a/Source/WebCore/platform/sql/SQLiteFileSystem.cpp b/Source/WebCore/platform/sql/SQLiteFileSystem.cpp
index ead5fec13d1c02f92218fb9f58267923377aabea..8419d76c8a5abe2d65013a1f39266fdcecb16aa5 100644 (file)
--- a/Source/WebCore/platform/sql/SQLiteFileSystem.cpp
+++ b/Source/WebCore/platform/sql/SQLiteFileSystem.cpp
@@ -37,7 +37,7 @@
 #include <sqlite3.h>
 
 #if PLATFORM(IOS)
-#include "SQLite3SPI.h"
+#include <pal/spi/ios/SQLite3SPI.h>
 #endif
 
 namespace WebCore {

diff --git a/Source/WebCore/rendering/RenderThemeIOS.mm b/Source/WebCore/rendering/RenderThemeIOS.mm
index d34c19538096bc196b715ed404eefe20595c24a9..7f5df0aa6a2e9f1b0d3bfd4c4e04d97ca4e07834 100644 (file)
--- a/Source/WebCore/rendering/RenderThemeIOS.mm
+++ b/Source/WebCore/rendering/RenderThemeIOS.mm
@@ -62,7 +62,6 @@
 #import "RenderStyle.h"
 #import "RenderView.h"
 #import "RuntimeEnabledFeatures.h"
-#import "UIKitSPI.h"
 #import "UTIUtilities.h"
 #import "UserAgentScripts.h"
 #import "UserAgentStyleSheets.h"
@@ -70,6 +69,7 @@
 #import <CoreGraphics/CoreGraphics.h>
 #import <objc/runtime.h>
 #import <pal/spi/cocoa/CoreTextSPI.h>
+#import <pal/spi/ios/UIKitSPI.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/RefPtr.h>
 #import <wtf/SoftLinking.h>

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index d8601e8cc2ce97f41501b91c24c4b81f85c14fd3..837dbf1e5691c9de989fa2f2000ef0012f3067cb 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2017-08-16  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [PAL] Move spi/ios and spi/win directories into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175171
+
+        Reviewed by Antti Koivisto.
+
+        * UIProcess/Cocoa/NavigationState.mm:
+        * UIProcess/ios/WKActionSheetAssistant.h:
+        * UIProcess/ios/WKActionSheetAssistant.mm:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        * UIProcess/ios/forms/WKAirPlayRoutePicker.mm:
+        * WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+
 2017-08-16  Miguel Gomez  <magomez@igalia.com>
 
         [GTK] Crash of WebProcess with on-demand AC

diff --git a/Source/WebKit/UIProcess/Cocoa/NavigationState.mm b/Source/WebKit/UIProcess/Cocoa/NavigationState.mm
index 19d07bf9560df13b3fe705f126ee92abcec33cd3..f363f35f32c2a2d2ff08efc563af753009e40c4b 100644 (file)
--- a/Source/WebKit/UIProcess/Cocoa/NavigationState.mm
+++ b/Source/WebKit/UIProcess/Cocoa/NavigationState.mm
@@ -71,7 +71,7 @@
 #import <wtf/NeverDestroyed.h>
 
 #if HAVE(APP_LINKS)
-#import <WebCore/LaunchServicesSPI.h>
+#import <pal/spi/ios/LaunchServicesSPI.h>
 #endif
 
 #if USE(QUICK_LOOK)

diff --git a/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.h b/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.h
index ccf8bc0095f57fb8970a5e1da1ac21edc0571ef7..25677e8b1c6a82048f1c37bb60ce599ce16cfc71 100644 (file)
--- a/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.h
+++ b/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.h
@@ -28,7 +28,7 @@
 #import "GestureTypes.h"
 #import "WKActionSheet.h"
 #import <UIKit/UIPopoverController.h>
-#import <WebCore/DataDetectorsUISPI.h>
+#import <pal/spi/ios/DataDetectorsUISPI.h>
 #import <wtf/RetainPtr.h>
 
 namespace WebKit {

diff --git a/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm b/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm
index f48e88c52236854e72dc24736d0b1fc335b938ea..c3e92a7e19daa8cea431bb66e8a18716d79ae8f6 100644 (file)
--- a/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm
+++ b/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm
@@ -47,7 +47,7 @@
 #import <wtf/text/WTFString.h>
 
 #if HAVE(APP_LINKS)
-#import <WebCore/LaunchServicesSPI.h>
+#import <pal/spi/ios/LaunchServicesSPI.h>
 #endif
 
 #if HAVE(SAFARI_SERVICES_FRAMEWORK)

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

diff --git a/Source/WebKit/UIProcess/ios/forms/WKAirPlayRoutePicker.mm b/Source/WebKit/UIProcess/ios/forms/WKAirPlayRoutePicker.mm
index 43500e370655a4187664ff2271cbb1410f6850dd..44ed1218d8eba1a9faf1c32e7523f543a737028b 100644 (file)
--- a/Source/WebKit/UIProcess/ios/forms/WKAirPlayRoutePicker.mm
+++ b/Source/WebKit/UIProcess/ios/forms/WKAirPlayRoutePicker.mm
@@ -29,7 +29,7 @@
 #if PLATFORM(IOS)
 
 #import "UIKitSPI.h"
-#import <WebCore/MediaPlayerSPI.h>
+#import <pal/spi/ios/MediaPlayerSPI.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/SoftLinking.h>
 

diff --git a/Source/WebKit/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm b/Source/WebKit/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm
index fb861652c4d24a2cb7742d4dad77376b5e45153e..f60ad402a385e7a6ba6359911e2ac0ac5dafbfd2 100644 (file)
--- a/Source/WebKit/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm
+++ b/Source/WebKit/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm
@@ -31,8 +31,8 @@
 #import "XPCServiceEntryPoint.h"
 
 #if PLATFORM(IOS)
-#import <WebCore/GraphicsServicesSPI.h>
 #import <WebCore/WebCoreThreadSystemInterface.h>
+#import <pal/spi/ios/GraphicsServicesSPI.h>
 #endif
 
 using namespace WebCore;

diff --git a/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm b/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
index 12845d7e46c17f799a62f19b6e1c7c7f07d31977..4f7d8f83343f10b50145e8ba1d7bee2b8a2f6124 100644 (file)
--- a/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
+++ b/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
@@ -70,7 +70,7 @@
 
 #if PLATFORM(IOS)
 #import "CelestialSPI.h"
-#import <WebCore/GraphicsServicesSPI.h>
+#import <pal/spi/ios/GraphicsServicesSPI.h>
 #import <wtf/SoftLinking.h>
 #endif
 

diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
index 219278a0974ff31624cc8f6b1b716940f25ad84a..0b69b4418032b606fad51e581655c01c6676e3bd 100644 (file)
--- a/Source/WebKitLegacy/ChangeLog
+++ b/Source/WebKitLegacy/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-16  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [PAL] Move spi/ios and spi/win directories into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175171
+
+        Reviewed by Antti Koivisto.
+
+        * Storage/StorageTracker.cpp:
+
 2017-08-10  Dan Bernstein  <mitz@apple.com>
 
         Restored svn:ignore values that went missing when the project got renamed.

diff --git a/Source/WebKitLegacy/Storage/StorageTracker.cpp b/Source/WebKitLegacy/Storage/StorageTracker.cpp
index 557806116843986345c8bfc94919da58ba71fe21..1326c7d1939259e32ff2f18cc50828cd191ea7cd 100644 (file)
--- a/Source/WebKitLegacy/Storage/StorageTracker.cpp
+++ b/Source/WebKitLegacy/Storage/StorageTracker.cpp
@@ -41,7 +41,7 @@
 #include <wtf/text/CString.h>
 
 #if PLATFORM(IOS)
-#include <WebCore/SQLite3SPI.h>
+#include <pal/spi/ios/SQLite3SPI.h>
 #endif
 
 using namespace WebCore;

diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
index 9ecd25040ab4139cb161ffa18cd1d82e5527c93c..5d18c3d2f61c8aac40014498e0c3b7d89a34b1fa 100644 (file)
--- a/Source/WebKitLegacy/mac/ChangeLog
+++ b/Source/WebKitLegacy/mac/ChangeLog
@@ -1,3 +1,13 @@
+2017-08-16  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [PAL] Move spi/ios and spi/win directories into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175171
+
+        Reviewed by Antti Koivisto.
+
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        * WebView/WebView.mm:
+
 2017-08-16  Andy Estes  <aestes@apple.com>
 
         [Payment Request] Add an ENABLE flag and an experimental feature preference

diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm b/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
index 1ed09f78fd0db108b5706944c77954d1983e03b4..2829fe9075ed6dd0a6f5f20da4d04df87fe7d161 100644 (file)
--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
+++ b/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
@@ -154,8 +154,8 @@
 #endif
 
 #if HAVE(APP_LINKS)
-#import <WebCore/LaunchServicesSPI.h>
 #import <WebCore/WebCoreThreadRun.h>
+#import <pal/spi/ios/LaunchServicesSPI.h>
 #endif
 
 #if ENABLE(CONTENT_FILTERING)

diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
index af0f7e2a9f6bd61355f16e8326eb4a67664699c5..b58036faa76486759ed1725d4239a1c826814ba5 100644 (file)
--- a/Source/WebKitLegacy/mac/WebView/WebView.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebView.mm
@@ -269,7 +269,6 @@
 #import <WebCore/FontCache.h>
 #import <WebCore/GraphicsLayer.h>
 #import <WebCore/LegacyTileCache.h>
-#import <WebCore/MobileGestaltSPI.h>
 #import <WebCore/PlatformScreen.h>
 #import <WebCore/ResourceLoadStatistics.h>
 #import <WebCore/SQLiteDatabaseTracker.h>
@@ -284,6 +283,7 @@
 #import <WebCore/WebSQLiteDatabaseTrackerClient.h>
 #import <WebCore/WebVideoFullscreenControllerAVKit.h>
 #import <libkern/OSAtomic.h>
+#import <pal/spi/ios/MobileGestaltSPI.h>
 #import <wtf/FastMalloc.h>
 #endif
 

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 85efb2978f9235fbaf19272e90a5faf399c08a7b..8230b2e8ff55583d6f78555009e1044e4629edc7 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-16  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        [PAL] Move spi/ios and spi/win directories into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175171
+
+        Reviewed by Antti Koivisto.
+
+        * DumpRenderTree/mac/EventSendingController.mm:
+
 2017-08-16  Andy Estes  <aestes@apple.com>
 
         [Payment Request] Add an ENABLE flag and an experimental feature preference

diff --git a/Tools/DumpRenderTree/mac/EventSendingController.mm b/Tools/DumpRenderTree/mac/EventSendingController.mm
index 38a67809dbac3b05796dda7d4454157cc27ee152..66b772efa5b6b1e1ce20c6258ee379c62560c4ee 100644 (file)
--- a/Tools/DumpRenderTree/mac/EventSendingController.mm
+++ b/Tools/DumpRenderTree/mac/EventSendingController.mm
@@ -49,11 +49,11 @@
 #endif
 
 #if PLATFORM(IOS)
-#import <WebCore/GraphicsServicesSPI.h> // for GSCurrentEventTimestamp()
+#import <UIKit/UIKit.h>
 #import <WebKit/KeyEventCodesIOS.h>
 #import <WebKit/WAKWindow.h>
 #import <WebKit/WebEvent.h>
-#import <UIKit/UIKit.h>
+#import <pal/spi/ios/GraphicsServicesSPI.h> // for GSCurrentEventTimestamp()
 #endif
 
 #if !PLATFORM(IOS)