[PAL] Relocate SessionID to root
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Aug 2017 22:48:54 +0000 (22:48 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Aug 2017 22:48:54 +0000 (22:48 +0000)
https://bugs.webkit.org/show_bug.cgi?id=175684

Reviewed by Alex Christensen.

Source/WebCore:

No new tests. No change in functionality.

* dom/Document.h:
* html/HTMLMediaElement.cpp:
* loader/cache/CachedResource.h:
* loader/cache/CachedResourceLoader.cpp:
* loader/cache/MemoryCache.h:
* loader/cocoa/DiskCacheMonitorCocoa.h:
* page/CacheStorageProvider.h:
* page/Page.h:
* page/PlugInClient.h:
* page/SocketProvider.h:
* platform/CookiesStrategy.h:
* platform/WebCoreCrossThreadCopier.cpp:
* platform/network/CacheValidation.h:
* platform/network/NetworkStorageSession.cpp:
* platform/network/NetworkStorageSession.h:
* platform/network/cf/SocketStreamHandleImpl.h:
* platform/network/curl/SocketStreamHandleImpl.h:
* platform/network/soup/SocketStreamHandleImpl.h:
* workers/WorkerGlobalScope.h:
* workers/service/ServiceWorkerContainer.h:
* workers/service/ServiceWorkerRegistrationParameters.h:

Source/WebCore/PAL:

* PAL.xcodeproj/project.pbxproj:
* pal/CMakeLists.txt:
* pal/SessionID.cpp: Renamed from Source/WebCore/PAL/pal/identifier/SessionID.cpp.
* pal/SessionID.h: Renamed from Source/WebCore/PAL/pal/identifier/SessionID.h.

Source/WebKit:

* NetworkProcess/Downloads/Download.h:
* NetworkProcess/Downloads/DownloadManager.cpp:
* NetworkProcess/NetworkCORSPreflightChecker.h:
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
* NetworkProcess/NetworkLoad.cpp:
* NetworkProcess/NetworkLoadParameters.h:
* NetworkProcess/NetworkProcess.cpp:
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkResourceLoadParameters.h:
* NetworkProcess/NetworkSession.h:
* NetworkProcess/NetworkSocketStream.h:
* NetworkProcess/RemoteNetworkingContext.h:
* NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
* Scripts/webkit/messages.py:
(forward_declarations_and_headers.templates): Deleted.
(class_template_headers.template): Deleted.
* Shared/ChildProcess.cpp:
* Shared/SessionTracker.h:
* Shared/Storage/StorageProcessCreationParameters.h:
* Shared/WebCoreArgumentCoders.cpp:
* Shared/WebPageCreationParameters.h:
* Shared/WebProcessCreationParameters.h:
* Shared/WebsiteDataStoreParameters.h:
* Shared/mac/CookieStorageShim.mm:
* StorageProcess/IndexedDB/WebIDBConnectionToClient.h:
* StorageProcess/StorageProcess.cpp:
* StorageProcess/StorageProcess.h:
* StorageProcess/StorageToWebProcessConnection.h:
* UIProcess/API/APIPageConfiguration.h:
* UIProcess/API/APIWebsiteDataStore.h:
* UIProcess/API/glib/WebKitCookieManager.cpp:
* UIProcess/Plugins/PlugInAutoStartProvider.h:
* UIProcess/WebCookieManagerProxy.h:
* UIProcess/WebProcessPool.cpp:
* UIProcess/WebProcessPool.h:
* UIProcess/WebProcessProxy.h:
* UIProcess/WebsiteData/WebsiteDataStore.h:
* WebProcess/Cookies/WebCookieManager.h:
* WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
* WebProcess/Databases/WebDatabaseProvider.cpp:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
* WebProcess/Network/NetworkProcessConnection.cpp:
* WebProcess/Network/WebLoaderStrategy.cpp:
* WebProcess/Network/WebSocketStream.cpp:
* WebProcess/Network/WebSocketStream.h:
* WebProcess/Storage/WebToStorageProcessConnection.h:
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
* WebProcess/WebCoreSupport/WebPlugInClient.h:
* WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h:
* WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp:
* WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h:
* WebProcess/WebPage/WebPage.cpp:
* WebProcess/WebProcess.h:

Source/WebKitLegacy:

* Storage/WebDatabaseProvider.cpp:

Source/WebKitLegacy/mac:

* WebCoreSupport/WebFrameNetworkingContext.mm:

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

83 files changed:
Source/WebCore/ChangeLog
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
Source/WebCore/PAL/pal/CMakeLists.txt
Source/WebCore/PAL/pal/SessionID.cpp [moved from Source/WebCore/PAL/pal/identifier/SessionID.cpp with 100% similarity]
Source/WebCore/PAL/pal/SessionID.h [moved from Source/WebCore/PAL/pal/identifier/SessionID.h with 100% similarity]
Source/WebCore/dom/Document.h
Source/WebCore/html/HTMLMediaElement.cpp
Source/WebCore/loader/cache/CachedResource.h
Source/WebCore/loader/cache/CachedResourceLoader.cpp
Source/WebCore/loader/cache/MemoryCache.h
Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h
Source/WebCore/page/CacheStorageProvider.h
Source/WebCore/page/Page.h
Source/WebCore/page/PlugInClient.h
Source/WebCore/page/SocketProvider.h
Source/WebCore/platform/CookiesStrategy.h
Source/WebCore/platform/WebCoreCrossThreadCopier.cpp
Source/WebCore/platform/network/CacheValidation.h
Source/WebCore/platform/network/NetworkStorageSession.cpp
Source/WebCore/platform/network/NetworkStorageSession.h
Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h
Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h
Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h
Source/WebCore/workers/WorkerGlobalScope.h
Source/WebCore/workers/service/ServiceWorkerContainer.h
Source/WebCore/workers/service/ServiceWorkerRegistrationParameters.h
Source/WebKit/ChangeLog
Source/WebKit/NetworkProcess/Downloads/Download.h
Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp
Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h
Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
Source/WebKit/NetworkProcess/NetworkLoad.cpp
Source/WebKit/NetworkProcess/NetworkLoadParameters.h
Source/WebKit/NetworkProcess/NetworkProcess.cpp
Source/WebKit/NetworkProcess/NetworkProcess.h
Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h
Source/WebKit/NetworkProcess/NetworkSession.h
Source/WebKit/NetworkProcess/NetworkSocketStream.h
Source/WebKit/NetworkProcess/RemoteNetworkingContext.h
Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp
Source/WebKit/Scripts/webkit/messages.py
Source/WebKit/Shared/ChildProcess.cpp
Source/WebKit/Shared/SessionTracker.h
Source/WebKit/Shared/Storage/StorageProcessCreationParameters.h
Source/WebKit/Shared/WebCoreArgumentCoders.cpp
Source/WebKit/Shared/WebPageCreationParameters.h
Source/WebKit/Shared/WebProcessCreationParameters.h
Source/WebKit/Shared/WebsiteDataStoreParameters.h
Source/WebKit/Shared/mac/CookieStorageShim.mm
Source/WebKit/StorageProcess/IndexedDB/WebIDBConnectionToClient.h
Source/WebKit/StorageProcess/StorageProcess.cpp
Source/WebKit/StorageProcess/StorageProcess.h
Source/WebKit/StorageProcess/StorageToWebProcessConnection.h
Source/WebKit/UIProcess/API/APIPageConfiguration.h
Source/WebKit/UIProcess/API/APIWebsiteDataStore.h
Source/WebKit/UIProcess/API/glib/WebKitCookieManager.cpp
Source/WebKit/UIProcess/Plugins/PlugInAutoStartProvider.h
Source/WebKit/UIProcess/WebCookieManagerProxy.h
Source/WebKit/UIProcess/WebProcessPool.cpp
Source/WebKit/UIProcess/WebProcessPool.h
Source/WebKit/UIProcess/WebProcessProxy.h
Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
Source/WebKit/WebProcess/Cookies/WebCookieManager.h
Source/WebKit/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h
Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp
Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
Source/WebKit/WebProcess/Network/NetworkProcessConnection.cpp
Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
Source/WebKit/WebProcess/Network/WebSocketStream.cpp
Source/WebKit/WebProcess/Network/WebSocketStream.h
Source/WebKit/WebProcess/Storage/WebToStorageProcessConnection.h
Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
Source/WebKit/WebProcess/WebCoreSupport/WebPlugInClient.h
Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h
Source/WebKit/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
Source/WebKit/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h
Source/WebKit/WebProcess/WebPage/WebPage.cpp
Source/WebKit/WebProcess/WebProcess.h
Source/WebKitLegacy/ChangeLog
Source/WebKitLegacy/Storage/WebDatabaseProvider.cpp
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/WebCoreSupport/WebFrameNetworkingContext.mm

index 03eb938..02482f4 100644 (file)
@@ -1,3 +1,34 @@
+2017-08-17  Don Olmstead  <don.olmstead@sony.com>
+
+        [PAL] Relocate SessionID to root
+        https://bugs.webkit.org/show_bug.cgi?id=175684
+
+        Reviewed by Alex Christensen.
+
+        No new tests. No change in functionality.
+
+        * dom/Document.h:
+        * html/HTMLMediaElement.cpp:
+        * loader/cache/CachedResource.h:
+        * loader/cache/CachedResourceLoader.cpp:
+        * loader/cache/MemoryCache.h:
+        * loader/cocoa/DiskCacheMonitorCocoa.h:
+        * page/CacheStorageProvider.h:
+        * page/Page.h:
+        * page/PlugInClient.h:
+        * page/SocketProvider.h:
+        * platform/CookiesStrategy.h:
+        * platform/WebCoreCrossThreadCopier.cpp:
+        * platform/network/CacheValidation.h:
+        * platform/network/NetworkStorageSession.cpp:
+        * platform/network/NetworkStorageSession.h:
+        * platform/network/cf/SocketStreamHandleImpl.h:
+        * platform/network/curl/SocketStreamHandleImpl.h:
+        * platform/network/soup/SocketStreamHandleImpl.h:
+        * workers/WorkerGlobalScope.h:
+        * workers/service/ServiceWorkerContainer.h:
+        * workers/service/ServiceWorkerRegistrationParameters.h:
+
 2017-08-17  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         Fix the build on other platforms after r220865
index d3be37f..154d2b7 100644 (file)
@@ -1,3 +1,15 @@
+2017-08-17  Don Olmstead  <don.olmstead@sony.com>
+
+        [PAL] Relocate SessionID to root
+        https://bugs.webkit.org/show_bug.cgi?id=175684
+
+        Reviewed by Alex Christensen.
+
+        * PAL.xcodeproj/project.pbxproj:
+        * pal/CMakeLists.txt:
+        * pal/SessionID.cpp: Renamed from Source/WebCore/PAL/pal/identifier/SessionID.cpp.
+        * pal/SessionID.h: Renamed from Source/WebCore/PAL/pal/identifier/SessionID.h.
+
 2017-08-17  Andreas Kling  <akling@apple.com>
 
         Disable CSS regions at compile time
index b5b1a9b..35716ca 100644 (file)
@@ -74,8 +74,6 @@
                A30D41211F0DD0EA00B71954 /* KillRing.h in Headers */ = {isa = PBXBuildFile; fileRef = A30D411E1F0DD0EA00B71954 /* KillRing.h */; };
                A30D41221F0DD0EA00B71954 /* KillRingNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A30D411F1F0DD0EA00B71954 /* KillRingNone.cpp */; };
                A30D41251F0DD12D00B71954 /* KillRingMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A30D41241F0DD12D00B71954 /* KillRingMac.mm */; };
-               A315882E1F44F805006DB16D /* SessionID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A315882C1F44F805006DB16D /* SessionID.cpp */; };
-               A315882F1F44F805006DB16D /* SessionID.h in Headers */ = {isa = PBXBuildFile; fileRef = A315882D1F44F805006DB16D /* SessionID.h */; };
                A3788E981F05B6CE00679425 /* Sound.h in Headers */ = {isa = PBXBuildFile; fileRef = A3788E971F05B6CE00679425 /* Sound.h */; };
                A3788E9C1F05B78200679425 /* SoundNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3788E9B1F05B78200679425 /* SoundNone.cpp */; };
                A3788E9E1F05B78E00679425 /* SoundMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3788E9D1F05B78E00679425 /* SoundMac.mm */; };
@@ -87,6 +85,8 @@
                A3AB6E611F3D1E39009C14B1 /* SleepDisablerCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = A3AB6E5F1F3D1E39009C14B1 /* SleepDisablerCocoa.h */; };
                A3AB6E641F3D217F009C14B1 /* SystemSleepListenerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = A3AB6E621F3D217F009C14B1 /* SystemSleepListenerMac.h */; };
                A3AB6E651F3D217F009C14B1 /* SystemSleepListenerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3AB6E631F3D217F009C14B1 /* SystemSleepListenerMac.mm */; };
+               A3C66CDC1F462D6A009E6EE9 /* SessionID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3C66CDA1F462D6A009E6EE9 /* SessionID.cpp */; };
+               A3C66CDD1F462D6A009E6EE9 /* SessionID.h in Headers */ = {isa = PBXBuildFile; fileRef = A3C66CDB1F462D6A009E6EE9 /* SessionID.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
                A30D411E1F0DD0EA00B71954 /* KillRing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KillRing.h; path = text/KillRing.h; sourceTree = "<group>"; };
                A30D411F1F0DD0EA00B71954 /* KillRingNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KillRingNone.cpp; path = text/KillRingNone.cpp; sourceTree = "<group>"; };
                A30D41241F0DD12D00B71954 /* KillRingMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = KillRingMac.mm; path = text/mac/KillRingMac.mm; sourceTree = "<group>"; };
-               A315882C1F44F805006DB16D /* SessionID.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SessionID.cpp; path = identifier/SessionID.cpp; sourceTree = "<group>"; };
-               A315882D1F44F805006DB16D /* SessionID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SessionID.h; path = identifier/SessionID.h; sourceTree = "<group>"; };
                A3788E971F05B6CE00679425 /* Sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sound.h; path = system/Sound.h; sourceTree = "<group>"; };
                A3788E9B1F05B78200679425 /* SoundNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SoundNone.cpp; path = system/SoundNone.cpp; sourceTree = "<group>"; };
                A3788E9D1F05B78E00679425 /* SoundMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SoundMac.mm; path = system/mac/SoundMac.mm; sourceTree = "<group>"; };
                A3AB6E5F1F3D1E39009C14B1 /* SleepDisablerCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SleepDisablerCocoa.h; path = system/cocoa/SleepDisablerCocoa.h; sourceTree = "<group>"; };
                A3AB6E621F3D217F009C14B1 /* SystemSleepListenerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SystemSleepListenerMac.h; path = system/mac/SystemSleepListenerMac.h; sourceTree = "<group>"; };
                A3AB6E631F3D217F009C14B1 /* SystemSleepListenerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SystemSleepListenerMac.mm; path = system/mac/SystemSleepListenerMac.mm; sourceTree = "<group>"; };
+               A3C66CDA1F462D6A009E6EE9 /* SessionID.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SessionID.cpp; sourceTree = "<group>"; };
+               A3C66CDB1F462D6A009E6EE9 /* SessionID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionID.h; sourceTree = "<group>"; };
                C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CopyPALHeaders.xcconfig; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
                        isa = PBXGroup;
                        children = (
                                1C09D0511E31C41200725F18 /* crypto */,
-                               A315882B1F44F7F0006DB16D /* identifier */,
                                0C2DA0651F33CA3300DBC317 /* spi */,
                                A3788E9F1F05B7CE00679425 /* system */,
                                A30D411D1F0DD0AC00B71954 /* text */,
                                0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */,
+                               A3C66CDA1F462D6A009E6EE9 /* SessionID.cpp */,
+                               A3C66CDB1F462D6A009E6EE9 /* SessionID.h */,
                        );
                        path = pal;
                        sourceTree = "<group>";
                        name = mac;
                        sourceTree = "<group>";
                };
-               A315882B1F44F7F0006DB16D /* identifier */ = {
-                       isa = PBXGroup;
-                       children = (
-                               A315882C1F44F805006DB16D /* SessionID.cpp */,
-                               A315882D1F44F805006DB16D /* SessionID.h */,
-                       );
-                       name = identifier;
-                       sourceTree = "<group>";
-               };
                A3788E9F1F05B7CE00679425 /* system */ = {
                        isa = PBXGroup;
                        children = (
                                0C2DA1571F3BEB4900DBC317 /* QuartzCoreSPI.h in Headers */,
                                0C5AF9201F43A4C7002EAC02 /* QuickLookSPI.h in Headers */,
                                0C2DA1581F3BEB4900DBC317 /* ServersSPI.h in Headers */,
-                               A315882F1F44F805006DB16D /* SessionID.h in Headers */,
+                               A3C66CDD1F462D6A009E6EE9 /* SessionID.h in Headers */,
                                A3AB6E561F3D1DDB009C14B1 /* SleepDisabler.h in Headers */,
                                A3AB6E611F3D1E39009C14B1 /* SleepDisablerCocoa.h in Headers */,
                                A3788E981F05B6CE00679425 /* Sound.h in Headers */,
                                1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */,
                                A30D41251F0DD12D00B71954 /* KillRingMac.mm in Sources */,
                                A30D41221F0DD0EA00B71954 /* KillRingNone.cpp in Sources */,
-                               A315882E1F44F805006DB16D /* SessionID.cpp in Sources */,
+                               A3C66CDC1F462D6A009E6EE9 /* SessionID.cpp in Sources */,
                                A3AB6E521F3D1DC5009C14B1 /* SleepDisabler.cpp in Sources */,
                                A3AB6E601F3D1E39009C14B1 /* SleepDisablerCocoa.cpp in Sources */,
                                A3788E9E1F05B78E00679425 /* SoundMac.mm in Sources */,
index e9b05c2..6fa1645 100644 (file)
@@ -1,5 +1,6 @@
 set(PAL_SOURCES
-    identifier/SessionID.cpp
+    SessionID.cpp
+
     system/SleepDisabler.cpp
     system/SystemSleepListener.cpp
 )
@@ -11,7 +12,6 @@ set(PAL_INCLUDE_DIRECTORIES
 set(PAL_PRIVATE_INCLUDE_DIRECTORIES
     "${PAL_DIR}/pal"
     "${PAL_DIR}/pal/crypto"
-    "${PAL_DIR}/pal/identifier"
     "${PAL_DIR}/pal/system"
     "${PAL_DIR}/pal/text"
 )
index f362069..3f002aa 100644 (file)
@@ -53,7 +53,7 @@
 #include "UserActionElementSet.h"
 #include "ViewportArguments.h"
 #include <memory>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Deque.h>
 #include <wtf/HashCountedSet.h>
 #include <wtf/HashSet.h>
index 7d6c2eb..63da901 100644 (file)
@@ -88,7 +88,7 @@
 #include "UserContentController.h"
 #include "UserGestureIndicator.h"
 #include <limits>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <pal/system/SleepDisabler.h>
 #include <runtime/Uint8Array.h>
 #include <wtf/Algorithms.h>
index 5435813..039f03a 100644 (file)
@@ -31,7 +31,7 @@
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "Timer.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <time.h>
 #include <wtf/HashCountedSet.h>
 #include <wtf/HashSet.h>
index a1c3345..a78c923 100644 (file)
@@ -71,7 +71,7 @@
 #include "SubresourceLoader.h"
 #include "UserContentController.h"
 #include "UserStyleSheet.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
index f67c81c..d26eec1 100644 (file)
@@ -27,7 +27,7 @@
 #include "NativeImage.h"
 #include "SecurityOriginHash.h"
 #include "Timer.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Forward.h>
 #include <wtf/Function.h>
 #include <wtf/HashMap.h>
index bdba1c9..ce52cfe 100644 (file)
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "ResourceRequest.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 typedef const struct _CFCachedURLResponse* CFCachedURLResponseRef;
 
index 3f6c884..0cb6ce2 100644 (file)
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "CacheStorageConnection.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/RefCounted.h>
 
 namespace WebCore {
index 23e94e7..84a86b1 100644 (file)
@@ -38,7 +38,7 @@
 #include "ViewportArguments.h"
 #include "WheelEventTestTrigger.h"
 #include <memory>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Forward.h>
 #include <wtf/Function.h>
 #include <wtf/HashSet.h>
index b8e91fb..fa5ed8e 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Forward.h>
 
 namespace WebCore {
index 75c02e6..d197977 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/ThreadSafeRefCounted.h>
 #include <wtf/text/WTFString.h>
 
index 5dc752e..5d75df4 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef CookiesStrategy_h
 #define CookiesStrategy_h
 
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
index 403676a..87d83a0 100644 (file)
@@ -32,7 +32,7 @@
 #include "WebCoreCrossThreadCopier.h"
 
 #include "ThreadSafeDataBuffer.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 namespace WTF {
 
index efe50ea..5aecf47 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "PlatformExportMacros.h"
 #include <chrono>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Optional.h>
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
index 41688c0..1f444e3 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "NetworkStorageSession.h"
 
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
index b459fc3..d8a9618 100644 (file)
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "CredentialStorage.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Function.h>
 #include <wtf/HashSet.h>
 #include <wtf/text/WTFString.h>
index 5d6f23f..1bdce08 100644 (file)
@@ -32,7 +32,7 @@
 #pragma once
 
 #include "SocketStreamHandle.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/StreamBuffer.h>
 
index 80b980b..38e8ce3 100644 (file)
@@ -38,7 +38,7 @@
 #endif
 
 #include <curl/curl.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Deque.h>
 #include <wtf/Lock.h>
 #include <wtf/RefCounted.h>
index fe02423..57448be 100644 (file)
@@ -36,7 +36,7 @@
 
 #if USE(SOUP)
 
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/StreamBuffer.h>
 #include <wtf/glib/GRefPtr.h>
 
index b890004..a5ce43e 100644 (file)
@@ -37,7 +37,7 @@
 #include "WorkerScriptController.h"
 #include <inspector/ConsoleMessage.h>
 #include <memory>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 namespace WebCore {
 
index 0e42bc4..3b76b1e 100644 (file)
@@ -33,7 +33,7 @@
 #include "ServiceWorkerJobClient.h"
 #include "ServiceWorkerRegistration.h"
 #include "ServiceWorkerRegistrationOptions.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Threading.h>
 
 namespace WebCore {
index 1f92a7f..efad542 100644 (file)
@@ -30,7 +30,7 @@
 #include "SecurityOriginData.h"
 #include "ServiceWorkerRegistrationOptions.h"
 #include "URL.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 namespace WebCore {
 
index b662618..8199ca5 100644 (file)
@@ -1,3 +1,64 @@
+2017-08-17  Don Olmstead  <don.olmstead@sony.com>
+
+        [PAL] Relocate SessionID to root
+        https://bugs.webkit.org/show_bug.cgi?id=175684
+
+        Reviewed by Alex Christensen.
+
+        * NetworkProcess/Downloads/Download.h:
+        * NetworkProcess/Downloads/DownloadManager.cpp:
+        * NetworkProcess/NetworkCORSPreflightChecker.h:
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        * NetworkProcess/NetworkLoad.cpp:
+        * NetworkProcess/NetworkLoadParameters.h:
+        * NetworkProcess/NetworkProcess.cpp:
+        * NetworkProcess/NetworkProcess.h:
+        * NetworkProcess/NetworkResourceLoadParameters.h:
+        * NetworkProcess/NetworkSession.h:
+        * NetworkProcess/NetworkSocketStream.h:
+        * NetworkProcess/RemoteNetworkingContext.h:
+        * NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
+        * Scripts/webkit/messages.py:
+        (forward_declarations_and_headers.templates): Deleted.
+        (class_template_headers.template): Deleted.
+        * Shared/ChildProcess.cpp:
+        * Shared/SessionTracker.h:
+        * Shared/Storage/StorageProcessCreationParameters.h:
+        * Shared/WebCoreArgumentCoders.cpp:
+        * Shared/WebPageCreationParameters.h:
+        * Shared/WebProcessCreationParameters.h:
+        * Shared/WebsiteDataStoreParameters.h:
+        * Shared/mac/CookieStorageShim.mm:
+        * StorageProcess/IndexedDB/WebIDBConnectionToClient.h:
+        * StorageProcess/StorageProcess.cpp:
+        * StorageProcess/StorageProcess.h:
+        * StorageProcess/StorageToWebProcessConnection.h:
+        * UIProcess/API/APIPageConfiguration.h:
+        * UIProcess/API/APIWebsiteDataStore.h:
+        * UIProcess/API/glib/WebKitCookieManager.cpp:
+        * UIProcess/Plugins/PlugInAutoStartProvider.h:
+        * UIProcess/WebCookieManagerProxy.h:
+        * UIProcess/WebProcessPool.cpp:
+        * UIProcess/WebProcessPool.h:
+        * UIProcess/WebProcessProxy.h:
+        * UIProcess/WebsiteData/WebsiteDataStore.h:
+        * WebProcess/Cookies/WebCookieManager.h:
+        * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h:
+        * WebProcess/Databases/WebDatabaseProvider.cpp:
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        * WebProcess/Network/NetworkProcessConnection.cpp:
+        * WebProcess/Network/WebLoaderStrategy.cpp:
+        * WebProcess/Network/WebSocketStream.cpp:
+        * WebProcess/Network/WebSocketStream.h:
+        * WebProcess/Storage/WebToStorageProcessConnection.h:
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+        * WebProcess/WebCoreSupport/WebPlugInClient.h:
+        * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.h:
+        * WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp:
+        * WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        * WebProcess/WebProcess.h:
+
 2017-08-17  Chris Dumez  <cdumez@apple.com>
 
         REGRESSION (r220601): Crash under ProcessAssertion::markAsInvalidated()
index bc9ea4f..d7c949c 100644 (file)
@@ -33,7 +33,7 @@
 #include <WebCore/ResourceHandleClient.h>
 #include <WebCore/ResourceRequest.h>
 #include <memory>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/RetainPtr.h>
 
index ef15301..4f9f466 100644 (file)
@@ -33,7 +33,7 @@
 #include "PendingDownload.h"
 #include "SessionTracker.h"
 #include <WebCore/NotImplemented.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/StdLibExtras.h>
 
 using namespace WebCore;
index ae9474a..fa74a05 100644 (file)
@@ -31,7 +31,7 @@
 #include <WebCore/ResourceHandleTypes.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Function.h>
 
 namespace WebCore {
index d241c0d..ce22707 100644 (file)
@@ -51,7 +51,7 @@
 #include <WebCore/PlatformCookieJar.h>
 #include <WebCore/ResourceLoaderOptions.h>
 #include <WebCore/ResourceRequest.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 #if USE(NETWORK_SESSION)
 #include "PingLoad.h"
index 85a5b12..4d1075c 100644 (file)
@@ -36,7 +36,7 @@
 #include <WebCore/ResourceHandle.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/SharedBuffer.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/MainThread.h>
 #include <wtf/Seconds.h>
 
index 14a5e93..67bf058 100644 (file)
@@ -29,7 +29,7 @@
 #include <WebCore/BlobDataFileReference.h>
 #include <WebCore/ResourceLoaderOptions.h>
 #include <WebCore/ResourceRequest.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 namespace WebKit {
 
index e1ef151..1aaa357 100644 (file)
@@ -63,7 +63,7 @@
 #include <WebCore/SecurityOriginHash.h>
 #include <WebCore/Settings.h>
 #include <WebCore/URLParser.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/OptionSet.h>
 #include <wtf/RunLoop.h>
 #include <wtf/text/CString.h>
index 23e8677..aad4ba0 100644 (file)
@@ -31,7 +31,7 @@
 #include "MessageReceiverMap.h"
 #include <WebCore/DiagnosticLoggingClient.h>
 #include <memory>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Forward.h>
 #include <wtf/Function.h>
 #include <wtf/MemoryPressureHandler.h>
index fc60fa8..35ba3ac 100644 (file)
@@ -35,7 +35,7 @@
 #include <WebCore/ResourceLoaderOptions.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/SecurityOrigin.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Seconds.h>
 
 namespace IPC {
index 5a3fe6c..fd1e63b 100644 (file)
@@ -27,7 +27,7 @@
 
 #if USE(NETWORK_SESSION)
 
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/HashSet.h>
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
index e465073..51f6286 100644 (file)
@@ -29,7 +29,7 @@
 #include "MessageSender.h"
 #include <WebCore/SocketStreamHandleClient.h>
 #include <WebCore/SocketStreamHandleImpl.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 namespace IPC {
 class Connection;
index 2e4e7c9..1d5b7a0 100644 (file)
@@ -28,7 +28,7 @@
 #define RemoteNetworkingContext_h
 
 #include <WebCore/NetworkingContext.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 namespace WebKit {
 
index 8d6ed04..cff5fb2 100644 (file)
@@ -32,7 +32,7 @@
 #include "NetworkCache.h"
 #include "NetworkLoad.h"
 #include "NetworkSession.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/RunLoop.h>
 
index 08aec1f..2be2868 100644 (file)
@@ -352,7 +352,7 @@ def headers_for_type(type):
 
     special_cases = {
         'String': ['<wtf/text/WTFString.h>'],
-        'PAL::SessionID': ['<pal/identifier/SessionID.h>'],
+        'PAL::SessionID': ['<pal/SessionID.h>'],
         'WebCore::AutoplayEventFlags': ['<WebCore/AutoplayEvent.h>'],
         'WebCore::ExceptionDetails': ['<WebCore/JSDOMExceptionHandling.h>'],
         'WebCore::FileChooserSettings': ['<WebCore/FileChooser.h>'],
index c8102a0..2c0228c 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "Logging.h"
 #include "SandboxInitializationParameters.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <unistd.h>
 
 namespace WebKit {
index bfe1509..84ed283 100644 (file)
@@ -30,7 +30,7 @@ namespace WebCore {
 class NetworkStorageSession;
 }
 
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/text/WTFString.h>
index 4617378..41c195f 100644 (file)
@@ -27,7 +27,7 @@
 #pragma once
 
 #include "SandboxExtension.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/text/WTFString.h>
 
 namespace IPC {
index 14a823c..0475b5b 100644 (file)
@@ -69,7 +69,7 @@
 #include <WebCore/UserStyleSheet.h>
 #include <WebCore/ViewportArguments.h>
 #include <WebCore/WindowFeatures.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/MonotonicTime.h>
 #include <wtf/Seconds.h>
 #include <wtf/text/CString.h>
index c9e59a8..35802ed 100644 (file)
@@ -42,7 +42,7 @@
 #include <WebCore/Pagination.h>
 #include <WebCore/ScrollTypes.h>
 #include <WebCore/UserInterfaceLayoutDirection.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/HashMap.h>
 #include <wtf/text/WTFString.h>
 
index d998802..56185ab 100644 (file)
@@ -29,7 +29,7 @@
 #include "SandboxExtension.h"
 #include "TextCheckerState.h"
 #include "UserData.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/Vector.h>
 #include <wtf/text/StringHash.h>
index e401a96..63fa231 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "SandboxExtension.h"
 #include <WebCore/Cookie.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
index 342748d..3a45427 100644 (file)
@@ -33,7 +33,7 @@
 #include "WebProcess.h"
 #include <WebCore/URL.h>
 #include <dlfcn.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <pal/spi/cf/CFNetworkSPI.h>
 #include <wtf/MainThread.h>
 #include <wtf/RetainPtr.h>
index 883381d..0087e8a 100644 (file)
@@ -30,7 +30,7 @@
 #include "MessageSender.h"
 #include "StorageToWebProcessConnection.h"
 #include <WebCore/IDBConnectionToClient.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 namespace WebCore {
 class IDBCursorInfo;
index 9946a68..5cd93dc 100644 (file)
@@ -36,7 +36,7 @@
 #include <WebCore/IDBKeyData.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/TextEncoding.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/CrossThreadTask.h>
 #include <wtf/MainThread.h>
 
index b8c7f77..c3aef9f 100644 (file)
@@ -30,7 +30,7 @@
 #include <WebCore/IDBBackingStore.h>
 #include <WebCore/IDBServer.h>
 #include <WebCore/UniqueIDBDatabase.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/CrossThreadTask.h>
 #include <wtf/Function.h>
 
index 5be9832..bc8e4d9 100644 (file)
@@ -28,7 +28,7 @@
 #include "Connection.h"
 #include "MessageSender.h"
 
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/HashMap.h>
 
 namespace WebKit {
index 23c011e..9455239 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "APIObject.h"
 #include "WebPreferencesStore.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Forward.h>
 #include <wtf/GetPtr.h>
 
index 44b1d3d..a4d2c37 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "APIHTTPCookieStore.h"
 #include "WebsiteDataStore.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/text/WTFString.h>
 
 namespace API {
index 2ef542e..eed2702 100644 (file)
@@ -27,7 +27,7 @@
 #include "WebKitWebsiteDataManagerPrivate.h"
 #include "WebKitWebsiteDataPrivate.h"
 #include "WebsiteDataRecord.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/glib/GRefPtr.h>
 #include <wtf/glib/WTFGType.h>
 #include <wtf/text/CString.h>
index 44b84f7..98bf067 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef PlugInAutoStartProvider_h
 #define PlugInAutoStartProvider_h
 
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/Noncopyable.h>
index 73dc4f4..eae5d24 100644 (file)
@@ -30,7 +30,7 @@
 #include "MessageReceiver.h"
 #include "WebContextSupplement.h"
 #include "WebCookieManagerProxyClient.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
index 134c348..91b0056 100644 (file)
@@ -77,7 +77,7 @@
 #include <WebCore/LogInitialization.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/URLParser.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <runtime/JSCInlines.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/MainThread.h>
index f313b60..73e0b04 100644 (file)
@@ -45,7 +45,7 @@
 #include "WebContextConnectionClient.h"
 #include "WebProcessProxy.h"
 #include <WebCore/LinkHash.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
index 5590daf..fa5f7e5 100644 (file)
@@ -40,7 +40,7 @@
 #include "WebProcessProxyMessages.h"
 #include <WebCore/LinkHash.h>
 #include <memory>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
 #include <wtf/RefCounted.h>
index 02f1133..81a3e76 100644 (file)
@@ -29,7 +29,7 @@
 #include <WebCore/Cookie.h>
 #include <WebCore/SecurityOriginData.h>
 #include <WebCore/SecurityOriginHash.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Function.h>
 #include <wtf/HashSet.h>
 #include <wtf/OptionSet.h>
index 68741ad..e9d75c5 100644 (file)
@@ -32,7 +32,7 @@
 #include "OptionalCallbackID.h"
 #include "WebProcessSupplement.h"
 #include <chrono>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <stdint.h>
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
index 2975595..ccb2948 100644 (file)
@@ -30,7 +30,7 @@
 #include "MessageSender.h"
 #include "SandboxExtension.h"
 #include <WebCore/IDBConnectionToServer.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 namespace WebKit {
 
index eb151ed..c6b10b1 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "WebProcess.h"
 #include "WebToStorageProcessConnection.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/HashMap.h>
 #include <wtf/NeverDestroyed.h>
 
index 4eb0159..a1a646d 100644 (file)
@@ -75,7 +75,7 @@
 #include <WebCore/UserGestureIndicator.h>
 #include <WebCore/UserScript.h>
 #include <WebCore/UserStyleSheet.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 #if ENABLE(NOTIFICATIONS)
 #include "WebNotificationManager.h"
index dd7860b..08666ab 100644 (file)
@@ -42,7 +42,7 @@
 #include <WebCore/CachedResource.h>
 #include <WebCore/MemoryCache.h>
 #include <WebCore/SharedBuffer.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 using namespace WebCore;
 
index 0eca0b2..ac197f1 100644 (file)
@@ -61,7 +61,7 @@
 #include <WebCore/SecurityOrigin.h>
 #include <WebCore/Settings.h>
 #include <WebCore/SubresourceLoader.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/text/CString.h>
 
 #if USE(QUICK_LOOK)
index c9f579c..a2857dc 100644 (file)
@@ -34,7 +34,7 @@
 #include "WebProcess.h"
 #include <WebCore/SocketStreamError.h>
 #include <WebCore/SocketStreamHandleClient.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/NeverDestroyed.h>
 
 using namespace WebCore;
index e9684ad..d50cad2 100644 (file)
@@ -28,7 +28,7 @@
 #include "MessageReceiver.h"
 #include "MessageSender.h"
 #include <WebCore/SocketStreamHandle.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 namespace IPC {
 class Connection;
index b033b4f..cc40b1f 100644 (file)
@@ -29,7 +29,7 @@
 #include "Connection.h"
 #include "MessageSender.h"
 #include "WebIDBConnectionToServer.h"
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/RefCounted.h>
 
 namespace PAL {
index ae64083..b646620 100644 (file)
@@ -62,7 +62,7 @@
 #include <WebCore/StorageNamespace.h>
 #include <WebCore/SubframeLoader.h>
 #include <WebCore/URL.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Atomics.h>
 
 #if PLATFORM(MAC)
index 6778b36..f6e0149 100644 (file)
@@ -27,7 +27,7 @@
 #define WebPlugInClient_h
 
 #include <WebCore/PlugInClient.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 namespace WebKit {
 
index e4629cb..5eb2b26 100644 (file)
@@ -29,7 +29,7 @@
 #include "HTTPCookieAcceptPolicy.h"
 #include "WebFrame.h"
 #include <WebCore/FrameNetworkingContext.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 namespace WebKit {
 
index 7ad7970..876baea 100644 (file)
@@ -35,7 +35,7 @@
 #include <WebCore/NetworkStorageSession.h>
 #include <WebCore/Settings.h>
 #include <WebCore/SoupNetworkSession.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 using namespace WebCore;
 
index a66e847..c1a348c 100644 (file)
@@ -28,7 +28,7 @@
 #pragma once
 
 #include <WebCore/FrameNetworkingContext.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 namespace WebKit {
 
index 96cdf48..a0a7b73 100644 (file)
 #include <WebCore/WebGLStateTracker.h>
 #include <WebCore/markup.h>
 #include <bindings/ScriptValue.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <profiler/ProfilerDatabase.h>
 #include <runtime/JSCInlines.h>
 #include <runtime/JSCJSValue.h>
index 3b5330d..10fed3e 100644 (file)
@@ -36,7 +36,7 @@
 #include <WebCore/ActivityState.h>
 #include <WebCore/HysteresisActivity.h>
 #include <WebCore/Timer.h>
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
index d1f9d1a..dbc0ee6 100644 (file)
@@ -1,5 +1,14 @@
 2017-08-17  Don Olmstead  <don.olmstead@sony.com>
 
+        [PAL] Relocate SessionID to root
+        https://bugs.webkit.org/show_bug.cgi?id=175684
+
+        Reviewed by Alex Christensen.
+
+        * Storage/WebDatabaseProvider.cpp:
+
+2017-08-17  Don Olmstead  <don.olmstead@sony.com>
+
         [PAL] Move SessionID into PAL
         https://bugs.webkit.org/show_bug.cgi?id=174192
 
index d37123c..0bedd34 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "WebDatabaseProvider.h"
 
-#include <pal/identifier/SessionID.h>
+#include <pal/SessionID.h>
 
 WebDatabaseProvider& WebDatabaseProvider::singleton()
 {
index 1ebddce..6350ec4 100644 (file)
@@ -1,3 +1,12 @@
+2017-08-17  Don Olmstead  <don.olmstead@sony.com>
+
+        [PAL] Relocate SessionID to root
+        https://bugs.webkit.org/show_bug.cgi?id=175684
+
+        Reviewed by Alex Christensen.
+
+        * WebCoreSupport/WebFrameNetworkingContext.mm:
+
 2017-08-17  Andreas Kling  <akling@apple.com>
 
         Disable CSS regions at compile time
index ba28112..24e5546 100644 (file)
@@ -33,7 +33,7 @@
 #import <WebCore/Page.h>
 #import <WebCore/ResourceError.h>
 #import <WebCore/Settings.h>
-#import <pal/identifier/SessionID.h>
+#import <pal/SessionID.h>
 #import <pal/spi/cf/CFNetworkSPI.h>
 
 #if PLATFORM(IOS)