Title: [226324] trunk/Source/WebKit
- Revision
- 226324
- Author
- achristen...@apple.com
- Date
- 2018-01-02 09:18:17 -0800 (Tue, 02 Jan 2018)
Log Message
Only use CookieStorageShim when we aren't using NetworkSession
https://bugs.webkit.org/show_bug.cgi?id=180766
Reviewed by Brent Fulgham.
* Shared/mac/CookieStorageShim.h:
* Shared/mac/CookieStorageShim.mm:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (226323 => 226324)
--- trunk/Source/WebKit/ChangeLog 2018-01-02 17:17:19 UTC (rev 226323)
+++ trunk/Source/WebKit/ChangeLog 2018-01-02 17:18:17 UTC (rev 226324)
@@ -1,5 +1,17 @@
2018-01-02 Alex Christensen <achristen...@webkit.org>
+ Only use CookieStorageShim when we aren't using NetworkSession
+ https://bugs.webkit.org/show_bug.cgi?id=180766
+
+ Reviewed by Brent Fulgham.
+
+ * Shared/mac/CookieStorageShim.h:
+ * Shared/mac/CookieStorageShim.mm:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+
+2018-01-02 Alex Christensen <achristen...@webkit.org>
+
Clean up context menu code
https://bugs.webkit.org/show_bug.cgi?id=181074
Modified: trunk/Source/WebKit/Shared/mac/CookieStorageShim.h (226323 => 226324)
--- trunk/Source/WebKit/Shared/mac/CookieStorageShim.h 2018-01-02 17:17:19 UTC (rev 226323)
+++ trunk/Source/WebKit/Shared/mac/CookieStorageShim.h 2018-01-02 17:18:17 UTC (rev 226324)
@@ -23,9 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef CookieStorageShim_h
-#define CookieStorageShim_h
+#pragma once
+#if !USE(NETWORK_SESSION)
+
#include <wtf/Noncopyable.h>
#include <wtf/NeverDestroyed.h>
@@ -47,4 +48,4 @@
}
-#endif // CookieStorageShim_h
+#endif
Modified: trunk/Source/WebKit/Shared/mac/CookieStorageShim.mm (226323 => 226324)
--- trunk/Source/WebKit/Shared/mac/CookieStorageShim.mm 2018-01-02 17:17:19 UTC (rev 226323)
+++ trunk/Source/WebKit/Shared/mac/CookieStorageShim.mm 2018-01-02 17:18:17 UTC (rev 226324)
@@ -26,6 +26,8 @@
#include "config.h"
#include "CookieStorageShim.h"
+#if !USE(NETWORK_SESSION)
+
#include "CookieStorageShimLibrary.h"
#include "NetworkConnectionToWebProcess.h"
#include "NetworkProcessConnection.h"
@@ -133,3 +135,6 @@
}
@end
+
+#endif
+
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (226323 => 226324)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2018-01-02 17:17:19 UTC (rev 226323)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2018-01-02 17:18:17 UTC (rev 226324)
@@ -385,7 +385,7 @@
ensureNetworkProcessConnection();
-#if PLATFORM(COCOA)
+#if PLATFORM(COCOA) && !USE(NETWORK_SESSION)
CookieStorageShim::singleton().initialize();
#endif
setTerminationTimeout(parameters.terminationTimeout);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
