Title: [220809] trunk
Revision
220809
Author
[email protected]
Date
2017-08-16 14:42:12 -0700 (Wed, 16 Aug 2017)

Log Message

[PAL] Move spi/ios and spi/win directories into PAL
https://bugs.webkit.org/show_bug.cgi?id=175171

Patch by Yoshiaki Jitsukawa <[email protected]> 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:

Modified Paths

Added Paths

Removed Paths

  • trunk/Source/WebCore/platform/spi/ios/
  • trunk/Source/WebCore/platform/spi/win/

Diff

Modified: trunk/Source/WebCore/ChangeLog (220808 => 220809)


--- trunk/Source/WebCore/ChangeLog	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/ChangeLog	2017-08-16 21:42:12 UTC (rev 220809)
@@ -1,3 +1,36 @@
+2017-08-16  Yoshiaki Jitsukawa  <[email protected]>
+
+        [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  <[email protected]>
 
         2-3% of main thread time under UTTypeCreatePreferredIdentifierForTag on wunderground map

Modified: trunk/Source/WebCore/PAL/ChangeLog (220808 => 220809)


--- trunk/Source/WebCore/PAL/ChangeLog	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/PAL/ChangeLog	2017-08-16 21:42:12 UTC (rev 220809)
@@ -1,3 +1,23 @@
+2017-08-16  Yoshiaki Jitsukawa  <[email protected]>
+
+        [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  <[email protected]>
 
         [Payment Request] Add an ENABLE flag and an experimental feature preference

Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (220808 => 220809)


--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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 */,
+				A30D41251F0DD12D00B71954 /* KillRingMac.mm in Sources */,
+				A30D41221F0DD0EA00B71954 /* KillRingNone.cpp in Sources */,
 				A3AB6E521F3D1DC5009C14B1 /* SleepDisabler.cpp in Sources */,
 				A3AB6E601F3D1E39009C14B1 /* SleepDisablerCocoa.cpp in Sources */,
-				A30D41251F0DD12D00B71954 /* KillRingMac.mm in Sources */,
-				A30D41221F0DD0EA00B71954 /* KillRingNone.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;
 		};

Copied: trunk/Source/WebCore/PAL/pal/spi/ios/CoreUISPI.h (from rev 220808, trunk/Source/WebCore/platform/spi/ios/CoreUISPI.h) (0 => 220809)


--- trunk/Source/WebCore/PAL/pal/spi/ios/CoreUISPI.h	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/CoreUISPI.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <CoreGraphics/CoreGraphics.h>
+#import <CoreText/CoreText.h>
+#import <Foundation/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <CoreUI/CUICatalog.h>
+#import <CoreUI/CUIStyleEffectConfiguration.h>
+
+#else
+
+@interface CUIStyleEffectConfiguration : NSObject <NSCopying>
+@end
+
+@interface CUIStyleEffectConfiguration ()
+@property (nonatomic) BOOL useSimplifiedEffect;
+@end
+
+@interface CUICatalog : NSObject
+@end
+
+@interface CUICatalog ()
+- (BOOL)drawGlyphs:(const CGGlyph[])glyphs atPositions:(const CGPoint[])positions inContext:(CGContextRef)context withFont:(CTFontRef)font count:(NSUInteger)count stylePresetName:(NSString *)stylePresetName styleConfiguration:(CUIStyleEffectConfiguration *)styleConfiguration foregroundColor:(CGColorRef)foregroundColor;
+@end
+
+#endif

Copied: trunk/Source/WebCore/PAL/pal/spi/ios/DataDetectorsUISPI.h (from rev 220808, trunk/Source/WebCore/platform/spi/ios/DataDetectorsUISPI.h) (0 => 220809)


--- trunk/Source/WebCore/PAL/pal/spi/ios/DataDetectorsUISPI.h	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/DataDetectorsUISPI.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if PLATFORM(IOS) && ENABLE(DATA_DETECTION)
+
+#import <UIKit/UIKit.h>
+#import <wtf/SoftLinking.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <DataDetectorsUI/DDAction.h>
+#import <DataDetectorsUI/DDDetectionController.h>
+
+#else
+
+#import <pal/spi/cocoa/DataDetectorsCoreSPI.h>
+
+@interface DDAction : NSObject
+@end
+
+@interface DDAction ()
+- (BOOL)hasUserInterface;
+- (NSString *)localizedName;
+@property (readonly) NSString *actionUTI;
+@end
+
+@protocol DDDetectionControllerInteractionDelegate <NSObject>
+@end
+
+@interface DDDetectionController : NSObject <UIActionSheetDelegate>
+@end
+
+@interface DDDetectionController ()
++ (DDDetectionController *)sharedController;
++ (NSArray *)tapAndHoldSchemes;
+- (void)performAction:(DDAction *)action fromAlertController:(UIAlertController *)alertController interactionDelegate:(id <DDDetectionControllerInteractionDelegate>)interactionDelegate;
+- (NSArray *)actionsForURL:(NSURL *)url identifier:(NSString *)identifier selectedText:(NSString *)selectedText results:(NSArray *)results context:(NSDictionary *)context;
+- (DDResultRef)resultForURL:(NSURL *)url identifier:(NSString *)identifier selectedText:(NSString *)selectedText results:(NSArray *)results context:(NSDictionary *)context extendedContext:(NSDictionary **)extendedContext;
+@end
+
+#endif
+
+SOFT_LINK_PRIVATE_FRAMEWORK(DataDetectorsUI)
+SOFT_LINK_CLASS(DataDetectorsUI, DDDetectionController)
+SOFT_LINK_CONSTANT(DataDetectorsUI, kDataDetectorsLeadingText, const NSString *)
+SOFT_LINK_CONSTANT(DataDetectorsUI, kDataDetectorsTrailingText, const NSString *)
+SOFT_LINK_CONSTANT(DataDetectorsUI, kDataDetectorsReferenceDateKey, const NSString *)
+
+#endif

Copied: trunk/Source/WebCore/PAL/pal/spi/ios/GraphicsServicesSPI.h (from rev 220808, trunk/Source/WebCore/platform/spi/ios/GraphicsServicesSPI.h) (0 => 220809)


--- trunk/Source/WebCore/PAL/pal/spi/ios/GraphicsServicesSPI.h	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/GraphicsServicesSPI.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#import <wtf/Platform.h>
+
+#if PLATFORM(IOS)
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <GraphicsServices/GraphicsServices.h>
+
+#endif
+
+WTF_EXTERN_C_BEGIN
+
+void GSInitialize(void);
+uint64_t GSCurrentEventTimestamp(void);
+CFStringRef GSSystemRootDirectory(void);
+void GSFontInitialize(void);
+void GSFontPurgeFontCache(void);
+
+WTF_EXTERN_C_END
+
+#endif

Copied: trunk/Source/WebCore/PAL/pal/spi/ios/LaunchServicesSPI.h (from rev 220808, trunk/Source/WebCore/platform/spi/ios/LaunchServicesSPI.h) (0 => 220809)


--- trunk/Source/WebCore/PAL/pal/spi/ios/LaunchServicesSPI.h	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/LaunchServicesSPI.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#import <Foundation/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <MobileCoreServices/LSAppLinkPriv.h>
+
+#endif
+
+@class LSAppLink;
+typedef void (^LSAppLinkCompletionHandler)(LSAppLink *appLink, NSError *error);
+typedef void (^LSAppLinkOpenCompletionHandler)(BOOL success, NSError *error);
+
+#if !USE(APPLE_INTERNAL_SDK)
+
+@interface LSResourceProxy : NSObject <NSCopying, NSSecureCoding>
+@end
+
+@interface LSBundleProxy : LSResourceProxy <NSSecureCoding>
+@end
+
+@interface LSApplicationProxy : LSBundleProxy <NSSecureCoding>
+- (NSString *)localizedNameForContext:(NSString *)context;
+@end
+
+@interface LSAppLink : NSObject <NSSecureCoding>
+@end
+
+@interface LSAppLink ()
++ (void)getAppLinkWithURL:(NSURL *)aURL completionHandler:(LSAppLinkCompletionHandler)completionHandler;
++ (void)openWithURL:(NSURL *)aURL completionHandler:(LSAppLinkOpenCompletionHandler)completionHandler;
+- (void)openInWebBrowser:(BOOL)inWebBrowser setAppropriateOpenStrategyAndWebBrowserState:(NSDictionary<NSString *, id> *)state completionHandler:(LSAppLinkOpenCompletionHandler)completionHandler;
+@property (readonly, strong) LSApplicationProxy *targetApplicationProxy;
+@end
+
+#endif

Copied: trunk/Source/WebCore/PAL/pal/spi/ios/MediaPlayerSPI.h (from rev 220808, trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h) (0 => 220809)


--- trunk/Source/WebCore/PAL/pal/spi/ios/MediaPlayerSPI.h	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/MediaPlayerSPI.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <wtf/Platform.h>
+
+#if PLATFORM(IOS)
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <MediaPlayer/MPAVRoutingController.h>
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000 && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+#import <MediaPlayer/MPMediaControlsViewController.h>
+#else
+#import <MediaPlayer/MPAVRoutingSheet.h>
+#import <MediaPlayer/MPAudioVideoRoutingPopoverController.h>
+#endif
+
+#else
+
+NS_ASSUME_NONNULL_BEGIN
+
+enum {
+    MPRouteDiscoveryModeDisabled = 0,
+    MPRouteDiscoveryModePresence = 1,
+    MPRouteDiscoveryModeDetailed = 2,
+};
+typedef NSInteger MPRouteDiscoveryMode;
+
+@interface MPAVRoutingController : NSObject
+@end
+
+@interface MPAVRoutingController ()
+- (instancetype)initWithName:(NSString *)name;
+@property (nonatomic, assign) MPRouteDiscoveryMode discoveryMode;
+@end
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000 && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+
+@interface MPMediaControlsViewController : UIViewController
+@property (nonatomic, copy, nullable) void (^didDismissHandler)(void);
+@end
+
+#else
+
+enum {
+    MPAVItemTypeUnknown = 0,
+    MPAVItemTypeAudio = 1,
+    MPAVItemTypeVideo = 2,
+};
+typedef NSUInteger MPAVItemType;
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+@interface MPAudioVideoRoutingPopoverController : UIPopoverController
+@end
+#pragma clang diagnostic pop
+
+@interface MPAudioVideoRoutingPopoverController ()
+- (id)initWithType:(MPAVItemType)avItemType;
+@end
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+@interface MPAVRoutingSheet : UIView
+@end
+#pragma clang diagnostic pop
+
+@interface MPAVRoutingSheet ()
+@property (nonatomic, assign, setter=setAVItemType:) MPAVItemType avItemType;
+@property (nonatomic, assign) BOOL mirroringOnly;
+- (id)initWithAVItemType:(MPAVItemType)avItemType;
+- (void)showInView:(UIView *)view withCompletionHandler:(void (^)(void))completionHandler;
+- (void)dismiss;
+@end
+
+#endif
+
+NS_ASSUME_NONNULL_END
+
+#endif
+
+#endif // PLATFORM(IOS)

Copied: trunk/Source/WebCore/PAL/pal/spi/ios/MobileGestaltSPI.h (from rev 220808, trunk/Source/WebCore/platform/spi/ios/MobileGestaltSPI.h) (0 => 220809)


--- trunk/Source/WebCore/PAL/pal/spi/ios/MobileGestaltSPI.h	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/MobileGestaltSPI.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2014-2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#import <wtf/Platform.h>
+
+#if PLATFORM(IOS)
+
+#include <CoreFoundation/CoreFoundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#include <MobileGestalt.h>
+
+#else
+
+static const CFStringRef kMGQAppleInternalInstallCapability = CFSTR("apple-internal-install");
+static const CFStringRef kMGQMainScreenPitch = CFSTR("main-screen-pitch");
+static const CFStringRef kMGQMainScreenScale = CFSTR("main-screen-scale");
+static const CFStringRef kMGQiPadCapability = CFSTR("ipad");
+static const CFStringRef kMGQDeviceName = CFSTR("DeviceName");
+static const CFStringRef kMGQDeviceClassNumber = CFSTR("DeviceClassNumber");
+static const CFStringRef kMGQHasExtendedColorDisplay = CFSTR("HasExtendedColorDisplay");
+
+typedef enum {
+    MGDeviceClassInvalid = -1,
+    /* 0 is intentionally not in this enum */
+    MGDeviceClassiPhone  = 1,
+    MGDeviceClassiPod    = 2,
+    MGDeviceClassiPad    = 3,
+    MGDeviceClassAppleTV = 4,
+    /* 5 is intentionally not in this enum */
+    MGDeviceClassWatch   = 6,
+} MGDeviceClass;
+
+#endif
+
+WTF_EXTERN_C_BEGIN
+
+CFTypeRef MGCopyAnswer(CFStringRef question, CFDictionaryRef options);
+
+#ifndef MGGetBoolAnswer
+bool MGGetBoolAnswer(CFStringRef question);
+#endif
+
+#ifndef MGGetSInt32Answer
+SInt32 MGGetSInt32Answer(CFStringRef question, SInt32 defaultValue);
+#endif
+
+#ifndef MGGetFloat32Answer
+Float32 MGGetFloat32Answer(CFStringRef question, Float32 defaultValue);
+#endif
+
+WTF_EXTERN_C_END
+
+#endif

Copied: trunk/Source/WebCore/PAL/pal/spi/ios/OpenGLESSPI.h (from rev 220808, trunk/Source/WebCore/platform/spi/ios/OpenGLESSPI.h) (0 => 220809)


--- trunk/Source/WebCore/PAL/pal/spi/ios/OpenGLESSPI.h	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/OpenGLESSPI.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Foundation/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+// FIXME: Remove EAGL_IOSURFACE macro once header refactoring is completed.
+#define EAGL_IOSURFACE 1
+#import <OpenGLES/EAGLPrivate.h>
+#undef EAGL_IOSURFACE
+
+#else
+
+typedef uint32_t EAGLContextParameter;
+
+enum {
+    kEAGLCPGPURestartStatusNone        = 0, /* context has not caused recent GPU restart */
+    kEAGLCPGPURestartStatusCaused      = 1, /* context caused recent GPU restart (clear on query) */
+    kEAGLCPGPURestartStatusBlacklisted = 2, /* context is being ignored for excessive GPU restarts */
+};
+
+/* (read-only) context caused GPU hang/crash, requiring a restart (see EAGLGPGPURestartStatus) */
+#define kEAGLCPGPURestartStatus                   ((EAGLContextParameter)317)
+/* (read-write) how to react to being blacklisted for causing excessive restarts (default to 1) */
+#define kEAGLCPAbortOnGPURestartStatusBlacklisted ((EAGLContextParameter)318)
+/* (read-only) does driver support auto-restart of GPU on hang/crash? */
+#define kEAGLCPSupportGPURestart                  ((EAGLContextParameter)319)
+/* (read-only) does driver/GPU support separate address space per context? */
+#define kEAGLCPSupportSeparateAddressSpace        ((EAGLContextParameter)320)
+
+@interface EAGLContext (EAGLPrivate)
+- (NSUInteger)setParameter:(EAGLContextParameter)pname to:(int32_t *)params;
+- (NSUInteger)getParameter:(EAGLContextParameter)pname to:(int32_t *)params;
+@end
+#endif

Copied: trunk/Source/WebCore/PAL/pal/spi/ios/QuickLookSPI.h (from rev 220808, trunk/Source/WebCore/platform/spi/ios/QuickLookSPI.h) (0 => 220809)


--- trunk/Source/WebCore/PAL/pal/spi/ios/QuickLookSPI.h	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/QuickLookSPI.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Foundation/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <QuickLook/QuickLookPrivate.h>
+
+#else
+
+@interface QLPreviewConverter : NSObject
+@end
+
+@interface QLPreviewConverter ()
+- (NSURLRequest *)safeRequestForRequest:(NSURLRequest *)request;
+- (id)initWithConnection:(NSURLConnection *)connection delegate:(id)delegate response:(NSURLResponse *)response options:(NSDictionary *)options;
+- (id)initWithData:(NSData *)data name:(NSString *)name uti:(NSString *)uti options:(NSDictionary *)options;
+- (void)appendDataArray:(NSArray *)dataArray;
+- (void)finishConverting;
+- (void)finishedAppendingData;
+@property (readonly, nonatomic) NSString *previewFileName;
+@property (readonly, nonatomic) NSString *previewUTI;
+@property (readonly, nonatomic) NSURLRequest *previewRequest;
+@property (readonly, nonatomic) NSURLResponse *previewResponse;
+@end
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+#define kQLReturnPasswordProtected 1 << 2
+#else
+#define kQLReturnMask 0xaf00
+#define kQLReturnPasswordProtected (kQLReturnMask | 20)
+#endif
+
+#endif
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+static_assert(kQLReturnPasswordProtected == 4, "kQLReturnPasswordProtected should equal 4.");
+#else
+static_assert(kQLReturnPasswordProtected == 44820, "kQLReturnPasswordProtected should equal 44820.");
+#endif
+
+WTF_EXTERN_C_BEGIN
+
+NSSet *QLPreviewGetSupportedMIMETypes();
+NSString *QLTypeCopyBestMimeTypeForFileNameAndMimeType(NSString *fileName, NSString *mimeType);
+NSString *QLTypeCopyBestMimeTypeForURLAndMimeType(NSURL *, NSString *mimeType);
+NSString *QLTypeCopyUTIForURLAndMimeType(NSURL *, NSString *mimeType);
+
+WTF_EXTERN_C_END

Copied: trunk/Source/WebCore/PAL/pal/spi/ios/SQLite3SPI.h (from rev 220808, trunk/Source/WebCore/platform/spi/ios/SQLite3SPI.h) (0 => 220809)


--- trunk/Source/WebCore/PAL/pal/spi/ios/SQLite3SPI.h	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/SQLite3SPI.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#include <sqlite3_private.h>
+
+#else
+
+#define SQLITE_FCNTL_TRUNCATE_DATABASE 101
+#define SQLITE_TRUNCATE_DATABASE SQLITE_FCNTL_TRUNCATE_DATABASE
+
+#endif

Copied: trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h (from rev 220808, trunk/Source/WebCore/platform/spi/ios/UIKitSPI.h) (0 => 220809)


--- trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <UIKit/UIApplicationSceneConstants.h>
+#import <UIKit/UIApplication_Private.h>
+#import <UIKit/UIInterface_Private.h>
+#import <UIKit/UIScreen_Private.h>
+#import <UIKit/UIViewController_Private.h>
+
+#if ENABLE(DATA_INTERACTION)
+#import <UIKit/NSAttributedString+UIItemProvider.h>
+#import <UIKit/NSString+UIItemProvider.h>
+#import <UIKit/NSURL+UIItemProvider.h>
+#import <UIKit/UIImage+UIItemProvider.h>
+#import <UIKit/UIItemProvider_Private.h>
+#endif
+
+@interface UIApplication ()
++ (UIApplicationSceneClassicMode)_classicMode;
+@end
+
+#else
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSInteger, UIApplicationSceneClassicMode) {
+    UIApplicationSceneClassicModeOriginalPad = 4,
+};
+
+@interface UIApplication ()
+
+- (BOOL)_isClassic;
++ (UIApplicationSceneClassicMode)_classicMode;
+
+@end
+
+@interface UIColor ()
+
++ (UIColor *)systemBlueColor;
++ (UIColor *)systemGrayColor;
++ (UIColor *)systemGreenColor;
++ (UIColor *)systemOrangeColor;
++ (UIColor *)systemPinkColor;
++ (UIColor *)systemRedColor;
++ (UIColor *)systemYellowColor;
+
+@end
+
+@interface UIScreen ()
+
+@property (nonatomic, readonly) CGRect _referenceBounds;
+
+@end
+
+@interface UIViewController ()
++ (UIViewController *)viewControllerForView:(UIView *)view;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+@interface NSURL ()
+@property (nonatomic, copy, nullable, setter=_setTitle:) NSString *_title;
+@end
+#endif
+
+#if ENABLE(DATA_INTERACTION)
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UIItemProvider : NSItemProvider
+@property (nonatomic) CGSize estimatedDisplayedSize;
+@end
+
+#define UIItemProviderRepresentationOptionsVisibilityAll NSItemProviderRepresentationVisibilityAll
+
+@protocol UIItemProviderReading <NSItemProviderReading>
+
+@required
+- (nullable instancetype)initWithItemProviderData:(NSData *)data typeIdentifier:(NSString *)typeIdentifier error:(NSError **)outError;
+
+@end
+
+@protocol UIItemProviderWriting <NSItemProviderWriting>
+
+@required
+- (NSProgress * _Nullable)loadDataWithTypeIdentifier:(NSString *)typeIdentifier forItemProviderCompletionHandler:(void (^)(NSData * _Nullable, NSError * _Nullable))completionHandler;
+
+@end
+
+@interface NSAttributedString () <UIItemProviderReading, UIItemProviderWriting>
+@end
+
+@interface NSString () <UIItemProviderReading, UIItemProviderWriting>
+@end
+
+@interface NSURL () <UIItemProviderReading, UIItemProviderWriting>
+@end
+
+@interface UIImage () <UIItemProviderReading, UIItemProviderWriting>
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
+
+#endif

Copied: trunk/Source/WebCore/PAL/pal/spi/win/CoreTextSPIWin.h (from rev 220808, trunk/Source/WebCore/platform/spi/win/CoreTextSPIWin.h) (0 => 220809)


--- trunk/Source/WebCore/PAL/pal/spi/win/CoreTextSPIWin.h	                        (rev 0)
+++ trunk/Source/WebCore/PAL/pal/spi/win/CoreTextSPIWin.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreGraphics/CoreGraphics.h>
+#include <CoreText/CoreText.h>
+
+WTF_EXTERN_C_BEGIN
+
+typedef const struct __CTFont* CTFontRef;
+typedef const struct __CTLine* CTLineRef;
+typedef UInt32 FourCharCode;
+typedef FourCharCode CTFontTableTag;
+
+CT_EXPORT const CFStringRef kCTFontAttributeName;
+CT_EXPORT const CFStringRef kCTFontCascadeListAttribute;
+CT_EXPORT const CFStringRef kCTFontNameAttribute;
+CT_EXPORT const CFStringRef kCTForegroundColorFromContextAttributeName;
+CT_EXPORT const CFStringRef kCTStrokeWidthAttributeName;
+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) {
+    kCTFontTableOptionNoOptions = 0,
+    kCTFontTableOptionExcludeSynthetic = (1 << 0)
+};
+#endif
+
+CTFontRef CTFontCreateWithName(CFStringRef, CGFloat size, const CGAffineTransform*);
+CTFontRef CTFontCreateWithGraphicsFont(CGFontRef, CGFloat size, const CGAffineTransform*, CTFontDescriptorRef attributes);
+CTLineRef CTLineCreateWithAttributedString(CFAttributedStringRef);
+void CTLineDraw(CTLineRef, CGContextRef);
+CFDataRef CTFontCopyTable(CTFontRef, CTFontTableTag, CTFontTableOptions);
+CFArrayRef CTFontCopyAvailableTables(CTFontRef, CTFontTableOptions);
+
+WTF_EXTERN_C_END
+

Modified: trunk/Source/WebCore/PlatformWin.cmake (220808 => 220809)


--- trunk/Source/WebCore/PlatformWin.cmake	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/PlatformWin.cmake	2017-08-16 21:42:12 UTC (rev 220809)
@@ -35,7 +35,6 @@
     "${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"

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (220808 => 220809)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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 */,

Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.mm (220808 => 220809)


--- trunk/Source/WebCore/editing/cocoa/DataDetection.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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"

Modified: trunk/Source/WebCore/loader/ios/PreviewLoader.mm (220808 => 220809)


--- trunk/Source/WebCore/loader/ios/PreviewLoader.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/loader/ios/PreviewLoader.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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;

Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (220808 => 220809)


--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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"

Modified: trunk/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm (220808 => 220809)


--- trunk/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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"

Modified: trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm (220808 => 220809)


--- trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -30,7 +30,7 @@
 
 #if PLATFORM(IOS)
 #include "Device.h"
-#include "UIKitSPI.h"
+#include <pal/spi/ios/UIKitSPI.h>
 #include <wtf/SoftLinking.h>
 #endif
 

Modified: trunk/Source/WebCore/page/ios/UserAgentIOS.mm (220808 => 220809)


--- trunk/Source/WebCore/page/ios/UserAgentIOS.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/page/ios/UserAgentIOS.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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>
 

Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (220808 => 220809)


--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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>

Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp (220808 => 220809)


--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp	2017-08-16 21:42:12 UTC (rev 220809)
@@ -37,7 +37,7 @@
 #include <wtf/text/TextStream.h>
 
 #if PLATFORM(WIN)
-#include "CoreTextSPIWin.h"
+#include <pal/spi/win/CoreTextSPIWin.h>
 #endif
 
 namespace WebCore {

Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (220808 => 220809)


--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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)

Modified: trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm (220808 => 220809)


--- trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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>

Modified: trunk/Source/WebCore/platform/graphics/opentype/OpenTypeCG.h (220808 => 220809)


--- trunk/Source/WebCore/platform/graphics/opentype/OpenTypeCG.h	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/graphics/opentype/OpenTypeCG.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -30,7 +30,7 @@
 #include <CoreText/CoreText.h>
 
 #if PLATFORM(WIN)
-#include "CoreTextSPIWin.h"
+#include <pal/spi/win/CoreTextSPIWin.h>
 #endif
 
 namespace WebCore {

Modified: trunk/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp (220808 => 220809)


--- trunk/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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>

Modified: trunk/Source/WebCore/platform/graphics/win/SimpleFontDataDirect2D.cpp (220808 => 220809)


--- trunk/Source/WebCore/platform/graphics/win/SimpleFontDataDirect2D.cpp	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/graphics/win/SimpleFontDataDirect2D.cpp	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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>

Modified: trunk/Source/WebCore/platform/ios/Device.h (220808 => 220809)


--- trunk/Source/WebCore/platform/ios/Device.h	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/ios/Device.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -28,7 +28,7 @@
 
 #if PLATFORM(IOS)
 
-#include "MobileGestaltSPI.h"
+#include <pal/spi/ios/MobileGestaltSPI.h>
 
 namespace WTF {
 class String;

Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (220808 => 220809)


--- trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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)

Modified: trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm (220808 => 220809)


--- trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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)

Modified: trunk/Source/WebCore/platform/ios/QuickLookSoftLink.h (220808 => 220809)


--- trunk/Source/WebCore/platform/ios/QuickLookSoftLink.h	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/ios/QuickLookSoftLink.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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)

Modified: trunk/Source/WebCore/platform/ios/QuickLookSoftLink.mm (220808 => 220809)


--- trunk/Source/WebCore/platform/ios/QuickLookSoftLink.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/ios/QuickLookSoftLink.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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)

Modified: trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm (220808 => 220809)


--- trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/ios/ValidationBubbleIOS.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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>

Modified: trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm (220808 => 220809)


--- trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -28,7 +28,6 @@
 
 #if ENABLE(DATA_INTERACTION)
 
-#import "UIKitSPI.h"
 #import <Foundation/NSProgress.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <UIKit/UIColor.h>
@@ -35,6 +34,7 @@
 #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>

Modified: trunk/Source/WebCore/platform/network/ios/PreviewConverter.mm (220808 => 220809)


--- trunk/Source/WebCore/platform/network/ios/PreviewConverter.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/network/ios/PreviewConverter.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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);

Modified: trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp (220808 => 220809)


--- trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp	2017-08-16 21:42:12 UTC (rev 220809)
@@ -37,7 +37,7 @@
 #include <sqlite3.h>
 
 #if PLATFORM(IOS)
-#include "SQLite3SPI.h"
+#include <pal/spi/ios/SQLite3SPI.h>
 #endif
 
 namespace WebCore {

Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (220808 => 220809)


--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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>

Modified: trunk/Source/WebKit/ChangeLog (220808 => 220809)


--- trunk/Source/WebKit/ChangeLog	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebKit/ChangeLog	2017-08-16 21:42:12 UTC (rev 220809)
@@ -1,3 +1,18 @@
+2017-08-16  Yoshiaki Jitsukawa  <[email protected]>
+
+        [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  <[email protected]>
 
         [GTK] Crash of WebProcess with on-demand AC

Modified: trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm (220808 => 220809)


--- trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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)

Modified: trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.h (220808 => 220809)


--- trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.h	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.h	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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 {

Modified: trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm (220808 => 220809)


--- trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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)

Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (220808 => 220809)


--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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>

Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKAirPlayRoutePicker.mm (220808 => 220809)


--- trunk/Source/WebKit/UIProcess/ios/forms/WKAirPlayRoutePicker.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKAirPlayRoutePicker.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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>
 

Modified: trunk/Source/WebKit/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm (220808 => 220809)


--- trunk/Source/WebKit/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebKit/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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;

Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (220808 => 220809)


--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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
 

Modified: trunk/Source/WebKitLegacy/ChangeLog (220808 => 220809)


--- trunk/Source/WebKitLegacy/ChangeLog	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebKitLegacy/ChangeLog	2017-08-16 21:42:12 UTC (rev 220809)
@@ -1,3 +1,12 @@
+2017-08-16  Yoshiaki Jitsukawa  <[email protected]>
+
+        [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  <[email protected]>
 
         Restored svn:ignore values that went missing when the project got renamed.

Modified: trunk/Source/WebKitLegacy/Storage/StorageTracker.cpp (220808 => 220809)


--- trunk/Source/WebKitLegacy/Storage/StorageTracker.cpp	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebKitLegacy/Storage/StorageTracker.cpp	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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;

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (220808 => 220809)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2017-08-16 21:42:12 UTC (rev 220809)
@@ -1,3 +1,13 @@
+2017-08-16  Yoshiaki Jitsukawa  <[email protected]>
+
+        [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  <[email protected]>
 
         [Payment Request] Add an ENABLE flag and an experimental feature preference

Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm (220808 => 220809)


--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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)

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (220808 => 220809)


--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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
 

Modified: trunk/Tools/ChangeLog (220808 => 220809)


--- trunk/Tools/ChangeLog	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Tools/ChangeLog	2017-08-16 21:42:12 UTC (rev 220809)
@@ -1,3 +1,12 @@
+2017-08-16  Yoshiaki Jitsukawa  <[email protected]>
+
+        [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  <[email protected]>
 
         [Payment Request] Add an ENABLE flag and an experimental feature preference

Modified: trunk/Tools/DumpRenderTree/mac/EventSendingController.mm (220808 => 220809)


--- trunk/Tools/DumpRenderTree/mac/EventSendingController.mm	2017-08-16 20:49:47 UTC (rev 220808)
+++ trunk/Tools/DumpRenderTree/mac/EventSendingController.mm	2017-08-16 21:42:12 UTC (rev 220809)
@@ -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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to