[PAL] Move spi/cf directory into PAL
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Aug 2017 00:20:37 +0000 (00:20 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Aug 2017 00:20:37 +0000 (00:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=175057

Patch by Yoshiaki Jitsukawa <jitsu@rd.scei.sony.co.jp> on 2017-08-03
Reviewed by Antti Koivisto.

Source/WebCore:

* WebCore.xcodeproj/project.pbxproj:
* loader/cocoa/DiskCacheMonitorCocoa.mm:
* loader/cocoa/SubresourceLoaderCocoa.mm:
* loader/mac/ResourceLoaderMac.mm:
* platform/cf/CoreMediaSoftLink.cpp:
* platform/cf/CoreMediaSoftLink.h:
* platform/mac/PluginBlacklist.mm:
* platform/mac/WebCoreNSStringExtras.mm:
* platform/mac/WebGLBlacklist.mm:
* platform/mediastream/mac/CoreAudioCaptureSource.cpp:
* platform/network/NetworkStorageSession.h:
* platform/network/cf/CookieJarCFNet.cpp:
* platform/network/cf/CredentialStorageCFNet.cpp:
* platform/network/cf/ResourceHandleCFNet.cpp:
* platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:
* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
* platform/network/cf/ResourceRequestCFNet.cpp:
* platform/network/cf/ResourceRequestCFNet.h:
* platform/network/cf/ResourceResponse.h:
* platform/network/cf/ResourceResponseCFNet.cpp:
* platform/network/cf/SocketStreamHandleImplCFNet.cpp:
* platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
* platform/network/cocoa/CookieStorageObserver.h:
* platform/network/cocoa/CredentialCocoa.h:
* platform/network/cocoa/NetworkStorageSessionCocoa.mm:
* platform/network/cocoa/ResourceRequestCocoa.mm:
* platform/network/cocoa/ResourceResponseCocoa.mm:
* platform/network/ios/ResourceRequestIOS.mm:
* platform/network/mac/CookieJarMac.mm:
* platform/network/mac/FormDataStreamMac.mm:
* platform/network/mac/ResourceHandleMac.mm:
* platform/network/mac/ResourceRequestMac.mm:
* platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
* platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
* platform/network/mac/WebCoreURLResponse.h:
* testing/cocoa/WebArchiveDumpSupport.mm:

Source/WebCore/PAL:

* PAL.xcodeproj/project.pbxproj:
* pal/spi/cf/CFLocaleSPI.h: Renamed from Source/WebCore/platform/spi/cf/CFLocaleSPI.h.
* pal/spi/cf/CFNetworkConnectionCacheSPI.h: Renamed from Source/WebCore/platform/spi/cf/CFNetworkConnectionCacheSPI.h.
* pal/spi/cf/CFNetworkSPI.h: Renamed from Source/WebCore/platform/spi/cf/CFNetworkSPI.h.
* pal/spi/cf/CFUtilitiesSPI.h: Renamed from Source/WebCore/platform/spi/cf/CFUtilitiesSPI.h.
* pal/spi/cf/CoreAudioSPI.h: Renamed from Source/WebCore/platform/spi/cf/CoreAudioSPI.h.
* pal/spi/cf/CoreMediaSPI.h: Renamed from Source/WebCore/platform/spi/cf/CoreMediaSPI.h.

Source/WebKit:

* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
* NetworkProcess/ios/NetworkProcessIOS.mm:
* NetworkProcess/mac/NetworkLoadMac.mm:
* NetworkProcess/mac/NetworkProcessMac.mm:
* Shared/cf/CookieStorageUtilsCF.h:
* Shared/mac/ChildProcessMac.mm:
* Shared/mac/CookieStorageShim.mm:
* UIProcess/API/Cocoa/WKHTTPCookieStore.mm:
* UIProcess/API/Cocoa/WKProcessPool.mm:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
* UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
* UIProcess/WebsiteData/WebsiteDataRecord.cpp:
* UIProcess/WebsiteData/WebsiteDataStore.h:
* UIProcess/mac/WebCookieManagerProxyMac.mm:
* WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
* WebProcess/cocoa/WebProcessCocoa.mm:

Source/WebKitLegacy/mac:

* Plugins/Hosted/HostedNetscapePluginStream.mm:
* Plugins/WebNetscapePluginStream.mm:
* WebCoreSupport/WebFrameNetworkingContext.mm:
* WebView/WebPreferences.mm:
* WebView/WebView.mm:

Tools:

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

Ignore "readability/naming/underscores" style errors for sources
under the WebCore/PAL/pal/spi directory.

* TestWebKitAPI/Tests/WebKit2Cocoa/CookieAcceptPolicy.mm:

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

75 files changed:
Source/WebCore/ChangeLog
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
Source/WebCore/PAL/pal/spi/cf/CFLocaleSPI.h [moved from Source/WebCore/platform/spi/cf/CFLocaleSPI.h with 97% similarity]
Source/WebCore/PAL/pal/spi/cf/CFNetworkConnectionCacheSPI.h [moved from Source/WebCore/platform/spi/cf/CFNetworkConnectionCacheSPI.h with 93% similarity]
Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h [moved from Source/WebCore/platform/spi/cf/CFNetworkSPI.h with 99% similarity]
Source/WebCore/PAL/pal/spi/cf/CFUtilitiesSPI.h [moved from Source/WebCore/platform/spi/cf/CFUtilitiesSPI.h with 100% similarity]
Source/WebCore/PAL/pal/spi/cf/CoreAudioSPI.h [moved from Source/WebCore/platform/spi/cf/CoreAudioSPI.h with 100% similarity]
Source/WebCore/PAL/pal/spi/cf/CoreMediaSPI.h [moved from Source/WebCore/platform/spi/cf/CoreMediaSPI.h with 97% similarity]
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm
Source/WebCore/loader/cocoa/SubresourceLoaderCocoa.mm
Source/WebCore/loader/mac/ResourceLoaderMac.mm
Source/WebCore/platform/cf/CoreMediaSoftLink.cpp
Source/WebCore/platform/cf/CoreMediaSoftLink.h
Source/WebCore/platform/mac/PluginBlacklist.mm
Source/WebCore/platform/mac/WebCoreNSStringExtras.mm
Source/WebCore/platform/mac/WebGLBlacklist.mm
Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp
Source/WebCore/platform/network/NetworkStorageSession.h
Source/WebCore/platform/network/cf/CookieJarCFNet.cpp
Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp
Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp
Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp
Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
Source/WebCore/platform/network/cf/ResourceRequestCFNet.h
Source/WebCore/platform/network/cf/ResourceResponse.h
Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp
Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp
Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
Source/WebCore/platform/network/cocoa/CookieStorageObserver.h
Source/WebCore/platform/network/cocoa/CredentialCocoa.h
Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm
Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm
Source/WebCore/platform/network/ios/ResourceRequestIOS.mm
Source/WebCore/platform/network/mac/CookieJarMac.mm
Source/WebCore/platform/network/mac/FormDataStreamMac.mm
Source/WebCore/platform/network/mac/ResourceHandleMac.mm
Source/WebCore/platform/network/mac/ResourceRequestMac.mm
Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm
Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
Source/WebCore/platform/network/mac/WebCoreURLResponse.h
Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm
Source/WebKit/ChangeLog
Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm
Source/WebKit/NetworkProcess/mac/NetworkLoadMac.mm
Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm
Source/WebKit/Shared/cf/CookieStorageUtilsCF.h
Source/WebKit/Shared/mac/ChildProcessMac.mm
Source/WebKit/Shared/mac/CookieStorageShim.mm
Source/WebKit/UIProcess/API/Cocoa/WKHTTPCookieStore.mm
Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
Source/WebKit/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm
Source/WebKit/UIProcess/WebsiteData/WebsiteDataRecord.cpp
Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
Source/WebKit/UIProcess/mac/WebCookieManagerProxyMac.mm
Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm
Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Plugins/Hosted/HostedNetscapePluginStream.mm
Source/WebKitLegacy/mac/Plugins/WebNetscapePluginStream.mm
Source/WebKitLegacy/mac/WebCoreSupport/WebFrameNetworkingContext.mm
Source/WebKitLegacy/mac/WebView/WebPreferences.mm
Source/WebKitLegacy/mac/WebView/WebView.mm
Tools/ChangeLog
Tools/Scripts/webkitpy/style/checker.py
Tools/Scripts/webkitpy/style/checker_unittest.py
Tools/TestWebKitAPI/Tests/WebKit2Cocoa/CookieAcceptPolicy.mm

index 4f07a44..665e691 100644 (file)
@@ -1,3 +1,47 @@
+2017-08-03  Yoshiaki Jitsukawa  <jitsu@rd.scei.sony.co.jp>
+
+        [PAL] Move spi/cf directory into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175057
+
+        Reviewed by Antti Koivisto.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * loader/cocoa/DiskCacheMonitorCocoa.mm:
+        * loader/cocoa/SubresourceLoaderCocoa.mm:
+        * loader/mac/ResourceLoaderMac.mm:
+        * platform/cf/CoreMediaSoftLink.cpp:
+        * platform/cf/CoreMediaSoftLink.h:
+        * platform/mac/PluginBlacklist.mm:
+        * platform/mac/WebCoreNSStringExtras.mm:
+        * platform/mac/WebGLBlacklist.mm:
+        * platform/mediastream/mac/CoreAudioCaptureSource.cpp:
+        * platform/network/NetworkStorageSession.h:
+        * platform/network/cf/CookieJarCFNet.cpp:
+        * platform/network/cf/CredentialStorageCFNet.cpp:
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        * platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:
+        * platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
+        * platform/network/cf/ResourceRequestCFNet.cpp:
+        * platform/network/cf/ResourceRequestCFNet.h:
+        * platform/network/cf/ResourceResponse.h:
+        * platform/network/cf/ResourceResponseCFNet.cpp:
+        * platform/network/cf/SocketStreamHandleImplCFNet.cpp:
+        * platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
+        * platform/network/cocoa/CookieStorageObserver.h:
+        * platform/network/cocoa/CredentialCocoa.h:
+        * platform/network/cocoa/NetworkStorageSessionCocoa.mm:
+        * platform/network/cocoa/ResourceRequestCocoa.mm:
+        * platform/network/cocoa/ResourceResponseCocoa.mm:
+        * platform/network/ios/ResourceRequestIOS.mm:
+        * platform/network/mac/CookieJarMac.mm:
+        * platform/network/mac/FormDataStreamMac.mm:
+        * platform/network/mac/ResourceHandleMac.mm:
+        * platform/network/mac/ResourceRequestMac.mm:
+        * platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
+        * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
+        * platform/network/mac/WebCoreURLResponse.h:
+        * testing/cocoa/WebArchiveDumpSupport.mm:
+
 2017-08-03  Youenn Fablet  <youenn@apple.com>
 
         Remove FETCH_API compilation guard
index c8f002d..9fc5ad1 100644 (file)
@@ -1,3 +1,18 @@
+2017-08-03  Yoshiaki Jitsukawa  <jitsu@rd.scei.sony.co.jp>
+
+        [PAL] Move spi/cf directory into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175057
+
+        Reviewed by Antti Koivisto.
+
+        * PAL.xcodeproj/project.pbxproj:
+        * pal/spi/cf/CFLocaleSPI.h: Renamed from Source/WebCore/platform/spi/cf/CFLocaleSPI.h.
+        * pal/spi/cf/CFNetworkConnectionCacheSPI.h: Renamed from Source/WebCore/platform/spi/cf/CFNetworkConnectionCacheSPI.h.
+        * pal/spi/cf/CFNetworkSPI.h: Renamed from Source/WebCore/platform/spi/cf/CFNetworkSPI.h.
+        * pal/spi/cf/CFUtilitiesSPI.h: Renamed from Source/WebCore/platform/spi/cf/CFUtilitiesSPI.h.
+        * pal/spi/cf/CoreAudioSPI.h: Renamed from Source/WebCore/platform/spi/cf/CoreAudioSPI.h.
+        * pal/spi/cf/CoreMediaSPI.h: Renamed from Source/WebCore/platform/spi/cf/CoreMediaSPI.h.
+
 2017-08-03  Youenn Fablet  <youenn@apple.com>
 
         Remove FETCH_API compilation guard
index ded0c2c..621b0c3 100644 (file)
 
 /* Begin PBXBuildFile section */
                0C2D9E731EEF5AF600DBC317 /* ExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */; };
+               0C2DA06D1F33CA8400DBC317 /* CFLocaleSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA0671F33CA8400DBC317 /* CFLocaleSPI.h */; };
+               0C2DA06E1F33CA8400DBC317 /* CFNetworkConnectionCacheSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA0681F33CA8400DBC317 /* CFNetworkConnectionCacheSPI.h */; };
+               0C2DA06F1F33CA8400DBC317 /* CFNetworkSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA0691F33CA8400DBC317 /* CFNetworkSPI.h */; };
+               0C2DA0701F33CA8400DBC317 /* CFUtilitiesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA06A1F33CA8400DBC317 /* CFUtilitiesSPI.h */; };
+               0C2DA0711F33CA8400DBC317 /* CoreAudioSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA06B1F33CA8400DBC317 /* CoreAudioSPI.h */; };
+               0C2DA0721F33CA8400DBC317 /* CoreMediaSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA06C1F33CA8400DBC317 /* CoreMediaSPI.h */; };
                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 */; };
 
 /* Begin PBXFileReference section */
                0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExportMacros.h; sourceTree = "<group>"; };
+               0C2DA0671F33CA8400DBC317 /* CFLocaleSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CFLocaleSPI.h; path = spi/cf/CFLocaleSPI.h; sourceTree = "<group>"; };
+               0C2DA0681F33CA8400DBC317 /* CFNetworkConnectionCacheSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CFNetworkConnectionCacheSPI.h; path = spi/cf/CFNetworkConnectionCacheSPI.h; sourceTree = "<group>"; };
+               0C2DA0691F33CA8400DBC317 /* CFNetworkSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CFNetworkSPI.h; path = spi/cf/CFNetworkSPI.h; sourceTree = "<group>"; };
+               0C2DA06A1F33CA8400DBC317 /* CFUtilitiesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CFUtilitiesSPI.h; path = spi/cf/CFUtilitiesSPI.h; sourceTree = "<group>"; };
+               0C2DA06B1F33CA8400DBC317 /* CoreAudioSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreAudioSPI.h; path = spi/cf/CoreAudioSPI.h; sourceTree = "<group>"; };
+               0C2DA06C1F33CA8400DBC317 /* CoreMediaSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreMediaSPI.h; path = spi/cf/CoreMediaSPI.h; sourceTree = "<group>"; };
                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>"; };
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+               0C2DA0651F33CA3300DBC317 /* spi */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0C2DA0661F33CA3A00DBC317 /* cf */,
+                       );
+                       name = spi;
+                       sourceTree = "<group>";
+               };
+               0C2DA0661F33CA3A00DBC317 /* cf */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0C2DA0671F33CA8400DBC317 /* CFLocaleSPI.h */,
+                               0C2DA0681F33CA8400DBC317 /* CFNetworkConnectionCacheSPI.h */,
+                               0C2DA0691F33CA8400DBC317 /* CFNetworkSPI.h */,
+                               0C2DA06A1F33CA8400DBC317 /* CFUtilitiesSPI.h */,
+                               0C2DA06B1F33CA8400DBC317 /* CoreAudioSPI.h */,
+                               0C2DA06C1F33CA8400DBC317 /* CoreMediaSPI.h */,
+                       );
+                       name = cf;
+                       sourceTree = "<group>";
+               };
                1C09D0341E31C32800725F18 = {
                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (
                                1C09D0511E31C41200725F18 /* crypto */,
+                               0C2DA0651F33CA3300DBC317 /* spi */,
                                A3788E9F1F05B7CE00679425 /* system */,
                                A30D411D1F0DD0AC00B71954 /* text */,
                                0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */,
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               0C2DA06D1F33CA8400DBC317 /* CFLocaleSPI.h in Headers */,
+                               0C2DA06E1F33CA8400DBC317 /* CFNetworkConnectionCacheSPI.h in Headers */,
+                               0C2DA06F1F33CA8400DBC317 /* CFNetworkSPI.h in Headers */,
+                               0C2DA0701F33CA8400DBC317 /* CFUtilitiesSPI.h in Headers */,
                                1C09D0581E31C57E00725F18 /* config.h in Headers */,
+                               0C2DA0711F33CA8400DBC317 /* CoreAudioSPI.h in Headers */,
+                               0C2DA0721F33CA8400DBC317 /* CoreMediaSPI.h in Headers */,
                                1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */,
                                0C2D9E731EEF5AF600DBC317 /* ExportMacros.h in Headers */,
                                A30D41211F0DD0EA00B71954 /* KillRing.h in Headers */,
similarity index 97%
rename from Source/WebCore/platform/spi/cf/CFLocaleSPI.h
rename to Source/WebCore/PAL/pal/spi/cf/CFLocaleSPI.h
index 1cf435e..5034177 100644 (file)
@@ -23,8 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef CFLocaleSPI_h
-#define CFLocaleSPI_h
+#pragma once
 
 #include <CoreFoundation/CoreFoundation.h>
 
@@ -39,5 +38,3 @@ WTF_EXTERN_C_BEGIN
 Boolean CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(CFStringRef locale, LangCode*, RegionCode*, ScriptCode*, CFStringEncoding*);
 
 WTF_EXTERN_C_END
-
-#endif
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CFNetworkConnectionCacheSPI_h
-#define CFNetworkConnectionCacheSPI_h
+#pragma once
 
 #if USE(APPLE_INTERNAL_SDK)
 #include <CFNetwork/CFNetworkConnectionCachePriv.h>
@@ -43,5 +42,3 @@ int _CFNetworkHTTPConnectionCacheGetLimit(HTTPConnectionCacheLimitKeys);
 void _CFNetworkHTTPConnectionCacheSetLimit(HTTPConnectionCacheLimitKeys, int);
 
 WTF_EXTERN_C_END
-
-#endif // CFNetworkConnectionCacheSPI_h
similarity index 99%
rename from Source/WebCore/platform/spi/cf/CFNetworkSPI.h
rename to Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
index 5738474..186e7c9 100644 (file)
@@ -27,8 +27,8 @@
 
 #pragma once
 
-#include "CFNetworkConnectionCacheSPI.h"
 #include <CFNetwork/CFNetwork.h>
+#include <pal/spi/cf/CFNetworkConnectionCacheSPI.h>
 
 #if PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
 
similarity index 97%
rename from Source/WebCore/platform/spi/cf/CoreMediaSPI.h
rename to Source/WebCore/PAL/pal/spi/cf/CoreMediaSPI.h
index 4910731..66119af 100644 (file)
@@ -23,8 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CoreMediaSPI_h
-#define CoreMediaSPI_h
+#pragma once
 
 #include <CoreMedia/CoreMedia.h>
 
@@ -63,5 +62,3 @@ typedef struct {
 WTF_EXTERN_C_END
 #endif
 #endif // PLATFORM(WIN)
-
-#endif // CoreMediaSPI_h
index d82e555..38fd21d 100644 (file)
                1AFFC4531D5E81C400267A66 /* WebGLBlacklist.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFFC4521D5E7EC700267A66 /* WebGLBlacklist.mm */; };
                1AFFC4541D5E81CB00267A66 /* BlacklistUpdater.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFFC44E1D5E7EC700267A66 /* BlacklistUpdater.mm */; };
                1AFFC4551D5E81D000267A66 /* PluginBlacklist.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFFC4501D5E7EC700267A66 /* PluginBlacklist.mm */; };
-               1AFFC4571D5E83A700267A66 /* CFUtilitiesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFFC4561D5E83A700267A66 /* CFUtilitiesSPI.h */; };
                1AFFC4581D5E865500267A66 /* WebGLBlacklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFFC4511D5E7EC700267A66 /* WebGLBlacklist.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AFFC4591D5E866100267A66 /* PluginBlacklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFFC44F1D5E7EC700267A66 /* PluginBlacklist.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1B124D8D1D380B7000ECDFB0 /* MediaSampleAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B124D8C1D380B7000ECDFB0 /* MediaSampleAVFObjC.h */; };
                443917FF1A91B2F8006E04F2 /* QuickLookSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */; };
                443918001A91B2F8006E04F2 /* QuickLookSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 443917FE1A91B2F8006E04F2 /* QuickLookSoftLink.h */; };
                443F04270E75C8FB007E5407 /* NetworkStateNotifierIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 443F04260E75C8FB007E5407 /* NetworkStateNotifierIOS.mm */; };
-               4449A4051A964B0000B64AD5 /* CoreMediaSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 4449A4041A964B0000B64AD5 /* CoreMediaSPI.h */; };
                444D4E230F708B2E003158E0 /* WebCoreURLResponseIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 444D4E210F708B2E003158E0 /* WebCoreURLResponseIOS.mm */; };
                4476531B133170990006B789 /* SSLKeyGeneratorIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4476531A133170990006B789 /* SSLKeyGeneratorIOS.cpp */; };
                447958041643B49A001E0A7F /* ParsedContentType.h in Headers */ = {isa = PBXBuildFile; fileRef = 447958031643B47B001E0A7F /* ParsedContentType.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A104F24414C71F7A009E2C23 /* CachedSVGDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = A104F24214C71F7A009E2C23 /* CachedSVGDocument.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A10BB5851484E3A700B2E87A /* RenderSVGRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A10BB5831484E3A700B2E87A /* RenderSVGRect.h */; };
                A10BB58B1484E3B300B2E87A /* RenderSVGShape.h in Headers */ = {isa = PBXBuildFile; fileRef = A10BB5891484E3B300B2E87A /* RenderSVGShape.h */; };
-               A10D7FEC1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A10D7FEB1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A10DBF4718F92317000D70C6 /* PreviewLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A10DBF4618F92317000D70C6 /* PreviewLoaderClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A10DC76A14747BAB005E2471 /* StyleGridData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A10DC76814747BAB005E2471 /* StyleGridData.cpp */; };
                A10DC76B14747BAB005E2471 /* StyleGridData.h in Headers */ = {isa = PBXBuildFile; fileRef = A10DC76914747BAB005E2471 /* StyleGridData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE1252511A1BEBD800864480 /* NSCalendarDateSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252501A1BEBD800864480 /* NSCalendarDateSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE1252531A1BEC0600864480 /* NSStringSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252521A1BEC0600864480 /* NSStringSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE1252551A1BEC0E00864480 /* NSURLDownloadSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252541A1BEC0E00864480 /* NSURLDownloadSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CE12525B1A1C018200864480 /* CFNetworkSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12525A1A1C018200864480 /* CFNetworkSPI.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 */; };
                1AFFC4501D5E7EC700267A66 /* PluginBlacklist.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginBlacklist.mm; sourceTree = "<group>"; };
                1AFFC4511D5E7EC700267A66 /* WebGLBlacklist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGLBlacklist.h; sourceTree = "<group>"; };
                1AFFC4521D5E7EC700267A66 /* WebGLBlacklist.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebGLBlacklist.mm; sourceTree = "<group>"; };
-               1AFFC4561D5E83A700267A66 /* CFUtilitiesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFUtilitiesSPI.h; sourceTree = "<group>"; };
                1B124D8C1D380B7000ECDFB0 /* MediaSampleAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MediaSampleAVFObjC.h; path = ../MediaSampleAVFObjC.h; sourceTree = "<group>"; };
                1B124D8E1D380BB600ECDFB0 /* MediaSampleAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaSampleAVFObjC.mm; sourceTree = "<group>"; };
                1BE5BFC11D515715001666D9 /* MediaConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaConstraints.cpp; sourceTree = "<group>"; };
                41A1B00D1E52656E007F3769 /* LibWebRTCProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LibWebRTCProvider.cpp; path = libwebrtc/LibWebRTCProvider.cpp; sourceTree = "<group>"; };
                41A1B01A1E542396007F3769 /* JSDOMGuardedObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMGuardedObject.h; sourceTree = "<group>"; };
                41A1B01B1E542396007F3769 /* JSDOMGuardedObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMGuardedObject.cpp; sourceTree = "<group>"; };
-               41A21F671ED5F46D008F2420 /* CoreAudioSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreAudioSPI.h; sourceTree = "<group>"; };
                41A3D58C101C152D00316D07 /* DedicatedWorkerThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DedicatedWorkerThread.cpp; sourceTree = "<group>"; };
                41A3D58D101C152D00316D07 /* DedicatedWorkerThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DedicatedWorkerThread.h; sourceTree = "<group>"; };
                41A48A9C1E83129100D2AC2D /* RTCPeerConnectionState.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCPeerConnectionState.idl; sourceTree = "<group>"; };
                443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickLookSoftLink.mm; sourceTree = "<group>"; };
                443917FE1A91B2F8006E04F2 /* QuickLookSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookSoftLink.h; sourceTree = "<group>"; };
                443F04260E75C8FB007E5407 /* NetworkStateNotifierIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkStateNotifierIOS.mm; sourceTree = "<group>"; };
-               4449A4041A964B0000B64AD5 /* CoreMediaSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreMediaSPI.h; sourceTree = "<group>"; };
                444D4E210F708B2E003158E0 /* WebCoreURLResponseIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreURLResponseIOS.mm; sourceTree = "<group>"; };
                4476531A133170990006B789 /* SSLKeyGeneratorIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SSLKeyGeneratorIOS.cpp; sourceTree = "<group>"; };
                447958021643B47B001E0A7F /* ParsedContentType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParsedContentType.cpp; sourceTree = "<group>"; };
                63189AE20E83A33300012E41 /* NodeRareData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeRareData.h; sourceTree = "<group>"; };
                637B7ADE0E8767B800E32194 /* ElementRareData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementRareData.h; sourceTree = "<group>"; };
                63D7B32C0E78CD3F00F7617C /* NodeRenderStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeRenderStyle.h; sourceTree = "<group>"; };
-               65086DA719AC1719009AF46B /* CFLocaleSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFLocaleSPI.h; sourceTree = "<group>"; };
                650FBF270D9AF046008FC292 /* SVGHKernElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGHKernElement.cpp; sourceTree = "<group>"; };
                650FBF280D9AF047008FC292 /* SVGHKernElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGHKernElement.h; sourceTree = "<group>"; };
                650FBF290D9AF047008FC292 /* SVGHKernElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SVGHKernElement.idl; sourceTree = "<group>"; };
                A10BB5831484E3A700B2E87A /* RenderSVGRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGRect.h; sourceTree = "<group>"; };
                A10BB5881484E3B300B2E87A /* RenderSVGShape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGShape.cpp; sourceTree = "<group>"; };
                A10BB5891484E3B300B2E87A /* RenderSVGShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGShape.h; sourceTree = "<group>"; };
-               A10D7FEB1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFNetworkConnectionCacheSPI.h; sourceTree = "<group>"; };
                A10DBF4618F92317000D70C6 /* PreviewLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreviewLoaderClient.h; sourceTree = "<group>"; };
                A10DC76814747BAB005E2471 /* StyleGridData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleGridData.cpp; sourceTree = "<group>"; };
                A10DC76914747BAB005E2471 /* StyleGridData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleGridData.h; sourceTree = "<group>"; };
                CE1252501A1BEBD800864480 /* NSCalendarDateSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSCalendarDateSPI.h; sourceTree = "<group>"; };
                CE1252521A1BEC0600864480 /* NSStringSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSStringSPI.h; sourceTree = "<group>"; };
                CE1252541A1BEC0E00864480 /* NSURLDownloadSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSURLDownloadSPI.h; sourceTree = "<group>"; };
-               CE12525A1A1C018200864480 /* CFNetworkSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFNetworkSPI.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>"; };
                        path = plugins;
                        sourceTree = "<group>";
                };
-               65086DA619AC1719009AF46B /* cf */ = {
-                       isa = PBXGroup;
-                       children = (
-                               65086DA719AC1719009AF46B /* CFLocaleSPI.h */,
-                               A10D7FEB1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h */,
-                               CE12525A1A1C018200864480 /* CFNetworkSPI.h */,
-                               1AFFC4561D5E83A700267A66 /* CFUtilitiesSPI.h */,
-                               41A21F671ED5F46D008F2420 /* CoreAudioSPI.h */,
-                               4449A4041A964B0000B64AD5 /* CoreMediaSPI.h */,
-                       );
-                       path = cf;
-                       sourceTree = "<group>";
-               };
                653EF83619A043AE0052202C /* spi */ = {
                        isa = PBXGroup;
                        children = (
-                               65086DA619AC1719009AF46B /* cf */,
                                1C9203F21A13D4660053192A /* cg */,
                                653EF83719A043AE0052202C /* cocoa */,
                                A172182419DE182B00464D17 /* ios */,
                                CD318623199F1E2A0030A0F7 /* CDMPrivateMediaSourceAVFObjC.h in Headers */,
                                CDE595971BF26E2100A1CBE8 /* CDMSessionMediaSourceAVFObjC.h in Headers */,
                                5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */,
-                               A10D7FEC1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h in Headers */,
-                               CE12525B1A1C018200864480 /* CFNetworkSPI.h in Headers */,
                                E1A8E56717552B2A007488E7 /* CFURLExtras.h in Headers */,
-                               1AFFC4571D5E83A700267A66 /* CFUtilitiesSPI.h in Headers */,
                                FE36FD1516C7826500F887C1 /* ChangeVersionData.h in Headers */,
                                97BC69DD1505F076001B74AC /* ChangeVersionWrapper.h in Headers */,
                                FD315FFF12B0267600C1A359 /* ChannelMergerNode.h in Headers */,
                                07AFF4221EFB144900B545B3 /* CoreAudioCaptureSourceIOS.h in Headers */,
                                CE1252371A15BDBE00864480 /* CoreGraphicsSPI.h in Headers */,
                                443818001A91B2F8006E04F2 /* CoreMediaSoftLink.h in Headers */,
-                               4449A4051A964B0000B64AD5 /* CoreMediaSPI.h in Headers */,
                                1C6466251A12C38E0094603C /* CoreTextSPI.h in Headers */,
                                CE1252431A16C01A00864480 /* CoreUISPI.h in Headers */,
                                CD7D33481C7A16BF00041293 /* CoreVideoSoftLink.h in Headers */,
index 4825bd0..3f18d26 100644 (file)
 #import "config.h"
 #import "DiskCacheMonitorCocoa.h"
 
-#import "CFNetworkSPI.h"
 #import "CachedResource.h"
 #import "MemoryCache.h"
 #import "SharedBuffer.h"
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/MainThread.h>
 #import <wtf/RefPtr.h>
 
index 8e003f5..a2fc944 100644 (file)
 #include "config.h"
 #include "SubresourceLoader.h"
 
-#include "CFNetworkSPI.h"
 #include "CachedResource.h"
 #include "DiskCacheMonitorCocoa.h"
 #include "ResourceHandle.h"
 #include "ResourceLoader.h"
 #include "SharedBuffer.h"
+#include <pal/spi/cf/CFNetworkSPI.h>
 
 namespace WebCore {
 
index 25f00f2..8904741 100644 (file)
 #include "config.h"
 #include "ResourceLoader.h"
 
-#include "CFNetworkSPI.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "SharedBuffer.h"
+#include <pal/spi/cf/CFNetworkSPI.h>
 
 namespace WebCore {
 
index 5acbdcb..5ee317a 100644 (file)
@@ -27,7 +27,7 @@
 #if USE(AVFOUNDATION)
 // FIXME: Should be USE(COREMEDIA), but this isn't currently defined on Windows.
 
-#include "CoreMediaSPI.h"
+#include <pal/spi/cf/CoreMediaSPI.h>
 #include <wtf/SoftLinking.h>
 
 #if PLATFORM(COCOA)
index dfb64b8..85896c7 100644 (file)
@@ -28,7 +28,7 @@
 #if USE(AVFOUNDATION)
 // FIXME: Should be USE(COREMEDIA), but this isn't currently defined on Windows.
 
-#include "CoreMediaSPI.h"
+#include <pal/spi/cf/CoreMediaSPI.h>
 #include <wtf/SoftLinking.h>
 
 SOFT_LINK_FRAMEWORK_FOR_HEADER(WebCore, CoreMedia)
index ebcc94f..cf19a5c 100644 (file)
@@ -29,7 +29,7 @@
 #if PLATFORM(MAC)
 
 #import "BlacklistUpdater.h"
-#import "CFUtilitiesSPI.h"
+#import <pal/spi/cf/CFUtilitiesSPI.h>
 #import <sys/stat.h>
 #import <sys/time.h>
 
index 29975fd..8e3cf51 100644 (file)
@@ -28,8 +28,8 @@
 
 #import "config.h"
 #import "WebCoreNSStringExtras.h"
-#import "CFLocaleSPI.h"
 
+#import <pal/spi/cf/CFLocaleSPI.h>
 #import <wtf/RetainPtr.h>
 
 BOOL stringIsCaseInsensitiveEqualToString(NSString *first, NSString *second)
index 6724bcf..bb7e331 100644 (file)
@@ -29,8 +29,8 @@
 #if PLATFORM(MAC)
 
 #import "BlacklistUpdater.h"
-#import "CFUtilitiesSPI.h"
 #import <OpenGL/OpenGL.h>
+#import <pal/spi/cf/CFUtilitiesSPI.h>
 
 namespace WebCore {
 
index 825c619..c37e463 100644 (file)
@@ -36,7 +36,6 @@
 #include "CoreAudioCaptureDevice.h"
 #include "CoreAudioCaptureDeviceManager.h"
 #include "CoreAudioCaptureSourceIOS.h"
-#include "CoreAudioSPI.h"
 #include "Logging.h"
 #include "MediaTimeAVFoundation.h"
 #include "Timer.h"
 #include <AudioUnit/AudioUnit.h>
 #include <CoreMedia/CMSync.h>
 #include <mach/mach_time.h>
+#include <pal/spi/cf/CoreAudioSPI.h>
 #include <sys/time.h>
 #include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
 #include "CoreMediaSoftLink.h"
 
-
 namespace WebCore {
 
 class CoreAudioCaptureSourceFactory : public RealtimeMediaSource::AudioCaptureFactory
index dfca324..ded26ca 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/text/WTFString.h>
 
 #if PLATFORM(COCOA) || USE(CFURLCONNECTION)
-#include "CFNetworkSPI.h"
+#include <pal/spi/cf/CFNetworkSPI.h>
 #include <wtf/RetainPtr.h>
 #endif
 
index 7324c3f..bf9b665 100644 (file)
 
 #if USE(CFURLCONNECTION)
 
-#include "CFNetworkSPI.h"
 #include "Cookie.h"
 #include "NetworkStorageSession.h"
 #include "NotImplemented.h"
 #include "URL.h"
 #include <CFNetwork/CFHTTPCookiesPriv.h>
 #include <CoreFoundation/CoreFoundation.h>
+#include <pal/spi/cf/CFNetworkSPI.h>
 #include <wtf/SoftLinking.h>
 #include <wtf/text/WTFString.h>
 
index 9da38bf..d6db6a7 100644 (file)
@@ -29,9 +29,9 @@
 #if USE(CFURLCONNECTION)
 
 #include "AuthenticationCF.h"
-#include "CFNetworkSPI.h"
 #include "Credential.h"
 #include "ProtectionSpace.h"
+#include <pal/spi/cf/CFNetworkSPI.h>
 #include <wtf/RetainPtr.h>
 
 #if PLATFORM(COCOA)
index 010b501..84d3ba9 100644 (file)
@@ -29,9 +29,8 @@
 
 #include "AuthenticationCF.h"
 #include "AuthenticationChallenge.h"
-#include "CFNetworkSPI.h"
-#include "CredentialStorage.h"
 #include "CachedResourceLoader.h"
+#include "CredentialStorage.h"
 #include "FormDataStreamCFNet.h"
 #include "Frame.h"
 #include "FrameLoader.h"
@@ -46,6 +45,7 @@
 #include "SynchronousLoaderClient.h"
 #include "SynchronousResourceHandleCFURLConnectionDelegate.h"
 #include <CFNetwork/CFNetwork.h>
+#include <pal/spi/cf/CFNetworkSPI.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <wtf/HashMap.h>
index 000e8f8..8926135 100644 (file)
 
 #if USE(CFURLCONNECTION)
 
-#include "CFNetworkSPI.h"
 #include "FormDataStreamCFNet.h"
 #include "NetworkingContext.h"
 #include "ResourceHandle.h"
+#include <pal/spi/cf/CFNetworkSPI.h>
 
 #if PLATFORM(COCOA)
 #include "WebCoreSystemInterface.h"
index f570464..d9093b1 100644 (file)
@@ -30,7 +30,6 @@
 
 #include "AuthenticationCF.h"
 #include "AuthenticationChallenge.h"
-#include "CFNetworkSPI.h"
 #include "Logging.h"
 #include "ResourceHandle.h"
 #include "ResourceHandleClient.h"
@@ -38,6 +37,7 @@
 #include "SharedBuffer.h"
 #include "WebCoreSystemInterface.h"
 #include "WebCoreURLResponse.h"
+#include <pal/spi/cf/CFNetworkSPI.h>
 #include <wtf/MainThread.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
index bd87d68..0b57aa4 100644 (file)
@@ -26,9 +26,9 @@
 #include "config.h"
 #include "ResourceRequestCFNet.h"
 
-#include "CFNetworkSPI.h"
 #include "HTTPHeaderNames.h"
 #include "ResourceRequest.h"
+#include <pal/spi/cf/CFNetworkSPI.h>
 
 #if ENABLE(PUBLIC_SUFFIX_LIST)
 #include "PublicSuffix.h"
index c288466..967d781 100644 (file)
@@ -25,9 +25,9 @@
 
 #pragma once
 
-#include "CFNetworkSPI.h"
 #include "ResourceLoadPriority.h"
 #include "ResourceRequestBase.h"
+#include <pal/spi/cf/CFNetworkSPI.h>
 
 namespace WebCore {
 
index 3d934d5..3129e55 100644 (file)
@@ -29,7 +29,7 @@
 #include <wtf/RetainPtr.h>
 
 #if USE(CFURLCONNECTION)
-#include "CFNetworkSPI.h"
+#include <pal/spi/cf/CFNetworkSPI.h>
 #endif
 
 OBJC_CLASS NSURLResponse;
index 7cdacaf..68a3780 100644 (file)
@@ -28,7 +28,7 @@
 
 #if USE(CFURLCONNECTION)
 
-#include "CFNetworkSPI.h"
+#include <pal/spi/cf/CFNetworkSPI.h>
 
 #include "HTTPParsers.h"
 #include "MIMETypeRegistry.h"
index a6304b1..3366aa6 100644 (file)
@@ -59,7 +59,7 @@ extern "C" const CFStringRef _kCFStreamSocketSetNoDelay;
 #endif
 
 #if PLATFORM(COCOA)
-#import <CFNetworkSPI.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #endif
 
 namespace WebCore {
index 60c8478..8e4d3ab 100644 (file)
@@ -41,9 +41,9 @@
 #include <wtf/text/WTFString.h>
 
 #if PLATFORM(COCOA)
-#include "CFNetworkSPI.h"
 #include "WebCoreSystemInterface.h"
 #include "WebCoreURLResponse.h"
+#include <pal/spi/cf/CFNetworkSPI.h>
 #endif // PLATFORM(COCOA)
 
 #if PLATFORM(IOS)
index 8603477..624ccc5 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "CFNetworkSPI.h"
+#include <pal/spi/cf/CFNetworkSPI.h>
 #include <wtf/Function.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/ThreadSafeRefCounted.h>
index a69fc25..82246ec 100644 (file)
@@ -30,7 +30,7 @@
 #include <wtf/RetainPtr.h>
 
 #if USE(CFURLCONNECTION)
-#include "CFNetworkSPI.h"
+#include <pal/spi/cf/CFNetworkSPI.h>
 #endif
 
 OBJC_CLASS NSURLCredential;
index f169663..53a79b2 100644 (file)
 #import "config.h"
 #import "NetworkStorageSession.h"
 
-#import "CFNetworkSPI.h"
 #import "Cookie.h"
 #import "CookieStorageObserver.h"
 #import "URL.h"
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 
 namespace WebCore {
index 5378763..642ae2e 100644 (file)
@@ -28,7 +28,6 @@
 
 #if PLATFORM(COCOA)
 
-#import "CFNetworkSPI.h"
 #import "FileSystem.h"
 #import "FormDataStreamMac.h"
 #import "HTTPHeaderNames.h"
@@ -36,6 +35,7 @@
 #import "RuntimeApplicationChecks.h"
 #import "WebCoreSystemInterface.h"
 #import <Foundation/Foundation.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/text/CString.h>
 
 namespace WebCore {
index e991c35..e5381a1 100644 (file)
 
 #if PLATFORM(COCOA)
 
-#import "CFNetworkSPI.h"
 #import "HTTPParsers.h"
 #import "WebCoreURLResponse.h"
 #import <Foundation/Foundation.h>
 #import <limits>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/AutodrainedPool.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/StdLibExtras.h>
index 3fe39c2..5eeb1b3 100644 (file)
@@ -28,7 +28,7 @@
 
 #if PLATFORM(IOS)
 
-#import "CFNetworkSPI.h"
+#import <pal/spi/cf/CFNetworkSPI.h>
 
 namespace WebCore {
 
index 5fdd1c1..6f5ec24 100644 (file)
@@ -26,9 +26,9 @@
 #import "config.h"
 #import "PlatformCookieJar.h"
 
-#import "CFNetworkSPI.h"
 #import "NetworkStorageSession.h"
 #import "WebCoreSystemInterface.h"
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 
 #if !USE(CFURLCONNECTION)
index 4240ee0..37b8f4a 100644 (file)
@@ -31,8 +31,8 @@
 
 #if !USE(CFURLCONNECTION)
 
-#import "CFNetworkSPI.h"
 #import "FormDataStreamCFNet.h"
+#import <pal/spi/cf/CFNetworkSPI.h>
 
 namespace WebCore {
 
index 4bbae9c..ec00862 100644 (file)
 
 #import "AuthenticationChallenge.h"
 #import "AuthenticationMac.h"
-#import "CFNetworkSPI.h"
+#import "CachedResourceLoader.h"
 #import "CookieStorage.h"
 #import "CredentialStorage.h"
-#import "CachedResourceLoader.h"
 #import "FormDataStreamMac.h"
 #import "Frame.h"
 #import "FrameLoader.h"
 #import "ResourceResponse.h"
 #import "SharedBuffer.h"
 #import "SubresourceLoader.h"
+#import "SynchronousLoaderClient.h"
 #import "WebCoreResourceHandleAsDelegate.h"
 #import "WebCoreResourceHandleAsOperationQueueDelegate.h"
-#import "SynchronousLoaderClient.h"
 #import "WebCoreSystemInterface.h"
 #import "WebCoreURLResponse.h"
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/BlockObjCExceptions.h>
 #import <wtf/Ref.h>
 #import <wtf/SchedulePair.h>
@@ -67,7 +67,6 @@ CFDictionaryRef _CFURLConnectionCopyTimingData(CFURLConnectionRef);
 #endif // USE(CFURLCONNECTION)
 
 #if PLATFORM(IOS)
-#import "CFNetworkSPI.h"
 #import "RuntimeApplicationChecks.h"
 #import "WebCoreThreadRun.h"
 #endif
index 8c5cab4..a472aee 100644 (file)
@@ -28,8 +28,8 @@
 
 #if PLATFORM(MAC)
 
-#import "CFNetworkSPI.h"
 #import <Foundation/Foundation.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 
 namespace WebCore {
 
index 52ed34f..4c2a4fa 100644 (file)
@@ -30,7 +30,6 @@
 
 #import "AuthenticationChallenge.h"
 #import "AuthenticationMac.h"
-#import "CFNetworkSPI.h"
 #import "Logging.h"
 #import "ResourceHandle.h"
 #import "ResourceHandleClient.h"
@@ -38,6 +37,7 @@
 #import "ResourceResponse.h"
 #import "SharedBuffer.h"
 #import "WebCoreURLResponse.h"
+#import <pal/spi/cf/CFNetworkSPI.h>
 
 using namespace WebCore;
 
index 91dda55..9651bae 100644 (file)
@@ -30,7 +30,6 @@
 
 #import "AuthenticationChallenge.h"
 #import "AuthenticationMac.h"
-#import "CFNetworkSPI.h"
 #import "Logging.h"
 #import "ResourceHandle.h"
 #import "ResourceHandleClient.h"
@@ -38,6 +37,7 @@
 #import "ResourceResponse.h"
 #import "SharedBuffer.h"
 #import "WebCoreURLResponse.h"
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/MainThread.h>
 
 using namespace WebCore;
index d72903b..e98f6a6 100644 (file)
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "CFNetworkSPI.h"
+#include <pal/spi/cf/CFNetworkSPI.h>
 
 namespace WebCore {
 
index 8957d3f..6a429e0 100644 (file)
 #import "config.h"
 #import "WebArchiveDumpSupport.h"
 
-#import "CFNetworkSPI.h"
 #import "MIMETypeRegistry.h"
 #import <CFNetwork/CFHTTPMessage.h>
 #import <CFNetwork/CFNetwork.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/NeverDestroyed.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/Vector.h>
index 14a8685..c7a1752 100644 (file)
@@ -1,3 +1,30 @@
+2017-08-03  Yoshiaki Jitsukawa  <jitsu@rd.scei.sony.co.jp>
+
+        [PAL] Move spi/cf directory into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175057
+
+        Reviewed by Antti Koivisto.
+
+        * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        * NetworkProcess/ios/NetworkProcessIOS.mm:
+        * NetworkProcess/mac/NetworkLoadMac.mm:
+        * NetworkProcess/mac/NetworkProcessMac.mm:
+        * Shared/cf/CookieStorageUtilsCF.h:
+        * Shared/mac/ChildProcessMac.mm:
+        * Shared/mac/CookieStorageShim.mm:
+        * UIProcess/API/Cocoa/WKHTTPCookieStore.mm:
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+        * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
+        * UIProcess/WebsiteData/WebsiteDataRecord.cpp:
+        * UIProcess/WebsiteData/WebsiteDataStore.h:
+        * UIProcess/mac/WebCookieManagerProxyMac.mm:
+        * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+
 2017-08-03  Youenn Fablet  <youenn@apple.com>
 
         Remove FETCH_API compilation guard
index 51276ec..b69bf08 100644 (file)
 #import "SessionTracker.h"
 #import "WebCoreArgumentCoders.h"
 #import <WebCore/AuthenticationChallenge.h>
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/FileSystem.h>
 #import <WebCore/NetworkStorageSession.h>
 #import <WebCore/NotImplemented.h>
 #import <WebCore/ResourceRequest.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/MainThread.h>
 #import <wtf/text/Base64.h>
 
index ede6023..d726f11 100644 (file)
@@ -32,7 +32,6 @@
 #import "NetworkSessionCocoa.h"
 #import "SandboxExtension.h"
 #import "SessionTracker.h"
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/NetworkStorageSession.h>
 #import <WebCore/PublicSuffix.h>
 #import <WebCore/ResourceRequestCFNet.h>
@@ -40,6 +39,7 @@
 #import <WebCore/SecurityOrigin.h>
 #import <WebCore/SecurityOriginData.h>
 #import <WebKitSystemInterface.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/BlockPtr.h>
 
 namespace WebKit {
index 9a452a5..63497c8 100644 (file)
@@ -38,7 +38,6 @@
 #import "NetworkProcess.h"
 #import "SessionTracker.h"
 #import <Foundation/NSURLSession.h>
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/Credential.h>
 #import <WebCore/FormDataStreamMac.h>
 #import <WebCore/FrameLoaderTypes.h>
@@ -50,6 +49,7 @@
 #import <WebCore/SharedBuffer.h>
 #import <WebCore/URL.h>
 #import <WebCore/WebCoreURLResponse.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/MainThread.h>
 #import <wtf/NeverDestroyed.h>
 
index cedbd7e..8c6bfa8 100644 (file)
 #import "ResourceCachesToClear.h"
 #import "SandboxInitializationParameters.h"
 #import "SecItemShim.h"
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/CertificateInfo.h>
 #import <WebCore/NotImplemented.h>
 #import <WebCore/WebCoreThreadSystemInterface.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 
 #define ENABLE_MANUAL_NETWORK_SANDBOXING 0
 
index 6475522..20eb2c8 100644 (file)
@@ -28,8 +28,8 @@
 
 #if !USE(NETWORK_SESSION)
 
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/ResourceHandle.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 
 namespace WebKit {
 
index f2aeedd..6f75295 100644 (file)
 #import "SandboxInitializationParameters.h"
 #import "SecItemShim.h"
 #import "StringUtilities.h"
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/CertificateInfo.h>
 #import <WebCore/FileSystem.h>
 #import <WebCore/LocalizedStrings.h>
 #import <WebKitSystemInterface.h>
 #import <notify.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <sysexits.h>
 #import <wtf/MemoryPressureHandler.h>
 #import <wtf/text/WTFString.h>
index a39d86f..373b8d7 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <WebCore/CFNetworkSPI.h>
+#include <pal/spi/cf/CFNetworkSPI.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/Vector.h>
 
index 378c118..81c7f7a 100644 (file)
 #import "CookieStorageUtilsCF.h"
 #import "SandboxInitializationParameters.h"
 #import "WebKitSystemInterface.h"
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/FileSystem.h>
 #import <WebCore/SystemVersion.h>
 #import <mach/mach.h>
 #import <mach/task.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <pwd.h>
 #import <stdlib.h>
 #import <sysexits.h>
index 99bcfab..52912fa 100644 (file)
 #include "NetworkProcessConnection.h"
 #include "WebCoreArgumentCoders.h"
 #include "WebProcess.h"
-#include <WebCore/CFNetworkSPI.h>
 #include <WebCore/SessionID.h>
 #include <WebCore/URL.h>
 #include <dlfcn.h>
+#include <pal/spi/cf/CFNetworkSPI.h>
 #include <wtf/MainThread.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/RunLoop.h>
index 321634c..52d4ece 100644 (file)
@@ -30,9 +30,9 @@
 
 #import "HTTPCookieAcceptPolicy.h"
 #import "WeakObjCPtr.h"
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/Cookie.h>
 #import <WebCore/URL.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/HashMap.h>
 #import <wtf/RetainPtr.h>
 
index 0779a20..4dd8a0d 100644 (file)
@@ -45,9 +45,9 @@
 #import "_WKAutomationSessionInternal.h"
 #import "_WKDownloadDelegate.h"
 #import "_WKProcessPoolConfigurationInternal.h"
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/CertificateInfo.h>
 #import <WebCore/PluginData.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/RetainPtr.h>
 
 #if PLATFORM(IOS)
index e54e02a..bfdb40d 100644 (file)
 #import "TextChecker.h"
 #import "VersionChecks.h"
 #import "WKBrowsingContextControllerInternal.h"
-#import "WKBrowsingContextControllerInternal.h"
 #import "WebKitSystemInterface.h"
 #import "WebPageGroup.h"
 #import "WebPreferencesKeys.h"
 #import "WebProcessCreationParameters.h"
 #import "WebProcessMessages.h"
 #import "WindowServerConnection.h"
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/Color.h>
 #import <WebCore/FileSystem.h>
 #import <WebCore/NotImplemented.h>
 #import <WebCore/PlatformPasteboard.h>
-#import <WebCore/SharedBuffer.h>
 #import <WebCore/RuntimeApplicationChecks.h>
+#import <WebCore/SharedBuffer.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <sys/param.h>
 
 #if PLATFORM(IOS)
index b1d7f4f..f754cf0 100644 (file)
 #import "SandboxUtilities.h"
 #import "WebKitSystemInterface.h"
 #import <QuartzCore/CARemoteLayerServer.h>
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/FileSystem.h>
 #import <WebCore/URL.h>
 #import <crt_externs.h>
 #import <mach-o/dyld.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <spawn.h>
 #import <wtf/text/CString.h>
 
index 2a04302..b16ae02 100644 (file)
@@ -30,9 +30,9 @@
 #import "StorageManager.h"
 #import "WebResourceLoadStatisticsStore.h"
 #import "WebsiteDataStoreParameters.h"
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/FileSystem.h>
 #import <WebCore/SearchPopupMenuCocoa.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/NeverDestroyed.h>
 
 #if PLATFORM(IOS)
index 4c9f553..c51af2f 100644 (file)
@@ -31,7 +31,7 @@
 #include <WebCore/SecurityOrigin.h>
 
 #if PLATFORM(COCOA)
-#import <WebCore/CFNetworkSPI.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #endif
 
 static String displayNameForLocalFiles()
index 4297407..53e621f 100644 (file)
@@ -39,7 +39,7 @@
 #include <wtf/text/WTFString.h>
 
 #if PLATFORM(COCOA)
-#include <WebCore/CFNetworkSPI.h>
+#include <pal/spi/cf/CFNetworkSPI.h>
 #endif
 
 namespace WebCore {
index aea0043..0d0e73e 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "WebCookieManagerProxy.h"
 
-#import <WebCore/CFNetworkSPI.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 
 namespace WebKit {
 
index 8eef9d2..dd7d5bf 100644 (file)
@@ -33,7 +33,6 @@
 #include "WebPage.h"
 #include "WebProcess.h"
 #include "WebsiteDataStoreParameters.h"
-#include <WebCore/CFNetworkSPI.h>
 #include <WebCore/Frame.h>
 #include <WebCore/FrameLoader.h>
 #include <WebCore/FrameLoaderClient.h>
@@ -42,6 +41,7 @@
 #include <WebCore/ResourceError.h>
 #include <WebCore/Settings.h>
 #include <WebKitSystemInterface.h>
+#include <pal/spi/cf/CFNetworkSPI.h>
 
 using namespace WebCore;
 
index beefc7b..8cce64e 100644 (file)
@@ -30,7 +30,6 @@
 #import "LegacyCustomProtocolManager.h"
 #import "Logging.h"
 #import "ObjCObjectGraph.h"
-#import <runtime/ConfigFile.h>
 #import "SandboxExtension.h"
 #import "SandboxInitializationParameters.h"
 #import "SecItemShim.h"
@@ -48,7 +47,6 @@
 #import "WebsiteDataStoreParameters.h"
 #import <JavaScriptCore/Options.h>
 #import <WebCore/AXObjectCache.h>
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/CPUMonitor.h>
 #import <WebCore/FileSystem.h>
 #import <WebCore/FontCache.h>
@@ -65,6 +63,8 @@
 #import <algorithm>
 #import <dispatch/dispatch.h>
 #import <objc/runtime.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
+#import <runtime/ConfigFile.h>
 #import <stdio.h>
 
 #if PLATFORM(IOS)
index 9746877..38594b4 100644 (file)
@@ -1,3 +1,16 @@
+2017-08-03  Yoshiaki Jitsukawa  <jitsu@rd.scei.sony.co.jp>
+
+        [PAL] Move spi/cf directory into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175057
+
+        Reviewed by Antti Koivisto.
+
+        * Plugins/Hosted/HostedNetscapePluginStream.mm:
+        * Plugins/WebNetscapePluginStream.mm:
+        * WebCoreSupport/WebFrameNetworkingContext.mm:
+        * WebView/WebPreferences.mm:
+        * WebView/WebView.mm:
+
 2017-08-03  Youenn Fablet  <youenn@apple.com>
 
         Remove FETCH_API compilation guard
index 0375ae0..19921a5 100644 (file)
@@ -37,7 +37,6 @@
 #import "WebNSURLExtras.h"
 #import "WebNSURLRequestExtras.h"
 #import "WebResourceLoadScheduler.h"
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/Document.h>
 #import <WebCore/DocumentLoader.h>
 #import <WebCore/Frame.h>
@@ -46,6 +45,7 @@
 #import <WebCore/SecurityOrigin.h>
 #import <WebCore/SecurityPolicy.h>
 #import <WebCore/WebCoreURLResponse.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/RefCountedLeakCounter.h>
 
 using namespace WebCore;
index f6e0aa5..6f19dfa 100644 (file)
@@ -39,7 +39,6 @@
 #import "WebNetscapePluginView.h"
 #import "WebResourceLoadScheduler.h"
 #import <Foundation/NSURLResponse.h>
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/CommonVM.h>
 #import <WebCore/Document.h>
 #import <WebCore/DocumentLoader.h>
@@ -53,6 +52,7 @@
 #import <WebCore/WebCoreObjCExtras.h>
 #import <WebCore/WebCoreURLResponse.h>
 #import <WebKitSystemInterface.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <runtime/JSLock.h>
 #import <wtf/HashMap.h>
 #import <wtf/NeverDestroyed.h>
index 2bc860a..1865ca9 100644 (file)
@@ -27,7 +27,6 @@
 
 #import "WebFrameInternal.h"
 #import "WebViewPrivate.h"
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/FrameLoader.h>
 #import <WebCore/FrameLoaderClient.h>
 #import <WebCore/NetworkStorageSession.h>
@@ -35,6 +34,7 @@
 #import <WebCore/ResourceError.h>
 #import <WebCore/SessionID.h>
 #import <WebCore/Settings.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 
 #if PLATFORM(IOS)
 #import <WebCore/WebCoreThread.h>
index cd40118..3658ddf 100644 (file)
 #import "WebSystemInterface.h"
 #import <WebCore/ApplicationCacheStorage.h>
 #import <WebCore/AudioSession.h>
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/NetworkStorageSession.h>
 #import <WebCore/PlatformCookieJar.h>
 #import <WebCore/ResourceHandle.h>
 #import <WebCore/RuntimeApplicationChecks.h>
 #import <WebCore/Settings.h>
 #import <WebCore/TextEncodingRegistry.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <runtime/InitializeThreading.h>
 #import <wtf/MainThread.h>
 #import <wtf/RetainPtr.h>
index 1d68f3e..ab0889a 100644 (file)
 #import <WebCore/AlternativeTextUIController.h>
 #import <WebCore/ApplicationCacheStorage.h>
 #import <WebCore/BackForwardController.h>
-#import <WebCore/CFNetworkSPI.h>
 #import <WebCore/CSSAnimationController.h>
 #import <WebCore/Chrome.h>
 #import <WebCore/ColorMac.h>
 #import <bindings/ScriptValue.h>
 #import <mach-o/dyld.h>
 #import <objc/runtime.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <runtime/ArrayPrototype.h>
 #import <runtime/CatchScope.h>
 #import <runtime/DateInstance.h>
index 897304d..89349e9 100644 (file)
@@ -1,3 +1,19 @@
+2017-08-03  Yoshiaki Jitsukawa  <jitsu@rd.scei.sony.co.jp>
+
+        [PAL] Move spi/cf directory into PAL
+        https://bugs.webkit.org/show_bug.cgi?id=175057
+
+        Reviewed by Antti Koivisto.
+
+        * Scripts/webkitpy/style/checker.py:
+        * Scripts/webkitpy/style/checker_unittest.py:
+        (GlobalVariablesTest.test_path_rules_specifier):
+
+        Ignore "readability/naming/underscores" style errors for sources
+        under the WebCore/PAL/pal/spi directory.
+
+        * TestWebKitAPI/Tests/WebKit2Cocoa/CookieAcceptPolicy.mm:
+
 2017-08-03  Youenn Fablet  <youenn@apple.com>
 
         Remove FETCH_API compilation guard
index 2bb3460..e67d53d 100644 (file)
@@ -235,6 +235,10 @@ _PATH_RULES_SPECIFIER = [
     ([# On some systems the trailing CR is causing parser failure.
       os.path.join('Source', 'JavaScriptCore', 'parser', 'Keywords.table')],
      ["+whitespace/carriage_return"]),
+
+    ([# Some SPI headers have identifier names with underscores.
+      os.path.join('Source', 'WebCore', 'PAL', 'pal', 'spi')],
+     ["-readability/naming/underscores"]),
 ]
 
 
index e899eff..177bbb5 100644 (file)
@@ -247,6 +247,10 @@ class GlobalVariablesTest(unittest.TestCase):
         # Javascript keywords.
         assertCheck(os.path.join('Source', 'JavaScriptCore', 'parser', 'Keywords.table'), "whitespace/carriage_return")
 
+        # Test if the exception for pal/spi is in place.
+        assertNoCheck(os.path.join('Source', 'WebCore', 'PAL', 'pal', 'spi'),
+                      "readability/naming/underscores")
+
     def test_max_reports_per_category(self):
         """Check that _MAX_REPORTS_PER_CATEGORY is valid."""
         all_categories = self._all_categories()
index 92ba9a1..c0e3825 100644 (file)
 #include "config.h"
 
 #import "PlatformUtilities.h"
-#import <WebCore/CFNetworkSPI.h>
 #import <WebKit/WKProcessPool.h>
 #import <WebKit/WKProcessPoolPrivate.h>
 #import <WebKit/WKWebView.h>
 #import <WebKit/WKWebViewConfiguration.h>
+#import <pal/spi/cf/CFNetworkSPI.h>
 #import <wtf/RetainPtr.h>
 
 #if WK_API_ENABLED