Attachment 340990 Details for Bug 185831 – Patch

[patch] Patch

bug-185831-20180522095825.patch (text/plain), 10.17 KB, created by Sihui Liu on 2018-05-22 09:58:26 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2018-05-22 09:58:26 PDT

Size: 10.17 KB

patch

obsolete

>Subversion Revision: 232025
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 0c6056afd860756ceb07b79faaa3e7140c1331b6..0e051f22c553038caf63940b83fa039fa8603a73 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,28 @@
>+2018-05-22  Sihui Liu  <sihui_liu@apple.com>
>+
>+        [iOS] TestWebKitAPI.WebKit.WKHTTPCookieStoreWithoutProcessPool fails because cookies use different files with/without processpool
>+        https://bugs.webkit.org/show_bug.cgi?id=185831
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Started to use uiProcessCookieStorageIdentifier for iOS: make sure cookies handled without 
>+        processpool would use the same storage file as when processpool exists.
>+
>+        * NetworkProcess/NetworkProcess.h:
>+        * NetworkProcess/NetworkProcessCreationParameters.cpp:
>+        (WebKit::NetworkProcessCreationParameters::encode const):
>+        (WebKit::NetworkProcessCreationParameters::decode):
>+        * NetworkProcess/NetworkProcessCreationParameters.h:
>+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
>+        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
>+        * Shared/WebProcessCreationParameters.cpp:
>+        (WebKit::WebProcessCreationParameters::encode const):
>+        (WebKit::WebProcessCreationParameters::decode):
>+        * Shared/WebProcessCreationParameters.h:
>+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
>+        (WebKit::WebProcessPool::platformInitializeWebProcess):
>+        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
>+
> 2018-05-21  Sihui Liu  <sihui_liu@apple.com>
> 
>         Add a diskCacheSizeOverride accessor function on WKContextConfigurationRef
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h
>index d3a790b9359fda4d4c71daca50710b8325172c7f..dab4f2463c882a6e387143a1b180d6db9d399707 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h
>@@ -244,7 +244,7 @@ private:
>     // Platform Helpers
>     void platformSetURLCacheSize(unsigned urlCacheMemoryCapacity, uint64_t urlCacheDiskCapacity);
> 
>-#if PLATFORM(MAC)
>+#if PLATFORM(COCOA)
>     static void setSharedHTTPCookieStorage(const Vector<uint8_t>& identifier);
> #endif
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>index a1b22b9c385ba104ce841fd3a31deaeeee73aee2..d61cff8d00a474d7308ab38c4a8e633feafeefb5 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>@@ -56,7 +56,7 @@ void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
> #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
>     encoder << shouldEnableNetworkCacheSpeculativeRevalidation;
> #endif
>-#if PLATFORM(MAC)
>+#if PLATFORM(COCOA)
>     encoder << uiProcessCookieStorageIdentifier;
> #endif
> #if PLATFORM(IOS)
>@@ -167,7 +167,7 @@ bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProc
>     if (!decoder.decode(result.shouldEnableNetworkCacheSpeculativeRevalidation))
>         return false;
> #endif
>-#if PLATFORM(MAC)
>+#if PLATFORM(COCOA)
>     if (!decoder.decode(result.uiProcessCookieStorageIdentifier))
>         return false;
> #endif
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>index ed693836513bd64cb546c1492f03bd5c17f152d6..25bc08f55cf7a4f6e71e901fb002635b5d945944 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>@@ -67,7 +67,7 @@ struct NetworkProcessCreationParameters {
> #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
>     bool shouldEnableNetworkCacheSpeculativeRevalidation { false };
> #endif
>-#if PLATFORM(MAC)
>+#if PLATFORM(COCOA)
>     Vector<uint8_t> uiProcessCookieStorageIdentifier;
> #endif
> #if PLATFORM(IOS)
>diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>index db9dc38d7a0dc1c6fd7bff3a0a4b82115e7d7ba0..e3f18acd4bb3e10bf1d9c00a4965a3b00b86b9a2 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>@@ -95,7 +95,7 @@ void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessC
> 
>     initializeNetworkSettings();
> 
>-#if PLATFORM(MAC)
>+#if PLATFORM(COCOA)
>     setSharedHTTPCookieStorage(parameters.uiProcessCookieStorageIdentifier);
> #endif
> 
>@@ -215,7 +215,7 @@ void NetworkProcess::clearDiskCache(WallTime modifiedSince, Function<void ()>&&
>     clearNSURLCache(m_clearCacheDispatchGroup, modifiedSince, WTFMove(completionHandler));
> }
> 
>-#if PLATFORM(MAC)
>+#if PLATFORM(COCOA)
> void NetworkProcess::setSharedHTTPCookieStorage(const Vector<uint8_t>& identifier)
> {
>     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
>diff --git a/Source/WebKit/Shared/WebProcessCreationParameters.cpp b/Source/WebKit/Shared/WebProcessCreationParameters.cpp
>index c3c503dba126d5f6942c09a51e652f415e0975aa..9a1659706ee6ee0b3a6166417f60ff89774017aa 100644
>--- a/Source/WebKit/Shared/WebProcessCreationParameters.cpp
>+++ b/Source/WebKit/Shared/WebProcessCreationParameters.cpp
>@@ -57,7 +57,7 @@ void WebProcessCreationParameters::encode(IPC::Encoder& encoder) const
>     encoder << mediaCacheDirectoryExtensionHandle;
>     encoder << javaScriptConfigurationDirectory;
>     encoder << javaScriptConfigurationDirectoryExtensionHandle;
>-#if PLATFORM(MAC)
>+#if PLATFORM(COCOA)
>     encoder << uiProcessCookieStorageIdentifier;
> #endif
> #if PLATFORM(IOS)
>@@ -209,7 +209,7 @@ bool WebProcessCreationParameters::decode(IPC::Decoder& decoder, WebProcessCreat
>         return false;
>     parameters.javaScriptConfigurationDirectoryExtensionHandle = WTFMove(*javaScriptConfigurationDirectoryExtensionHandle);
> 
>-#if PLATFORM(MAC)
>+#if PLATFORM(COCOA)
>     if (!decoder.decode(parameters.uiProcessCookieStorageIdentifier))
>         return false;
> #endif
>diff --git a/Source/WebKit/Shared/WebProcessCreationParameters.h b/Source/WebKit/Shared/WebProcessCreationParameters.h
>index 21f9151750a6d858125d022d7ce7837359188ae0..81d347e2f207aaf9ef5e558546d1f71f55a7c80c 100644
>--- a/Source/WebKit/Shared/WebProcessCreationParameters.h
>+++ b/Source/WebKit/Shared/WebProcessCreationParameters.h
>@@ -79,7 +79,7 @@ struct WebProcessCreationParameters {
>     SandboxExtension::Handle mediaCacheDirectoryExtensionHandle;
>     String javaScriptConfigurationDirectory;
>     SandboxExtension::Handle javaScriptConfigurationDirectoryExtensionHandle;
>-#if PLATFORM(MAC)
>+#if PLATFORM(COCOA)
>     Vector<uint8_t> uiProcessCookieStorageIdentifier;
> #endif
> #if PLATFORM(IOS)
>diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
>index 3823945d17dc20d71b7b14c20521d482545f9a6a..47038243907599d98edacf4c6c2125797054d326 100644
>--- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
>@@ -246,7 +246,7 @@ void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters&
>     }
>     parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
> 
>-#if PLATFORM(MAC)
>+#if PLATFORM(COCOA)
>     ASSERT(parameters.uiProcessCookieStorageIdentifier.isEmpty());
>     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
>     parameters.uiProcessCookieStorageIdentifier = identifyingDataFromCookieStorage([[NSHTTPCookieStorage sharedHTTPCookieStorage] _cookieStorage]);
>@@ -309,7 +309,7 @@ void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationPara
>     parameters.shouldSuppressMemoryPressureHandler = [defaults boolForKey:WebKitSuppressMemoryPressureHandlerDefaultsKey];
>     parameters.loadThrottleLatency = Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. };
> 
>-#if PLATFORM(MAC)
>+#if PLATFORM(COCOA)
>     ASSERT(parameters.uiProcessCookieStorageIdentifier.isEmpty());
>     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
>     parameters.uiProcessCookieStorageIdentifier = identifyingDataFromCookieStorage([[NSHTTPCookieStorage sharedHTTPCookieStorage] _cookieStorage]);
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index db55e3c883da710b03e8cd9a1f22b97987cc671c..965d04e8b8c995a507609b93b18e15147c4491af 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-22  Sihui Liu  <sihui_liu@apple.com>
>+
>+        [iOS] TestWebKitAPI.WebKit.WKHTTPCookieStoreWithoutProcessPool is crashing with reason: 'Completion handler passed to -[CookieUIDelegate webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:] was not called'
>+        https://bugs.webkit.org/show_bug.cgi?id=185831
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Updated the test to prevent crash after assertion fails.
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:
>+        (-[CookieUIDelegate webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:]):
>+
> 2018-05-21  Jer Noble  <jer.noble@apple.com>
> 
>         Complete fix for enabling modern EME by default
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>index b9e7a2b81114d53f9e54e4d564141aa7fe0f677a..deb09a127ea0e70dd7ea4592274045eebfc77871 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm
>@@ -378,7 +378,7 @@ @implementation CookieUIDelegate
> - (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(void))completionHandler
> {
>     auto cookies = String(message.UTF8String);
>-    ASSERT_TRUE(cookies == "PersistentCookieName=CookieValue; SessionCookieName=CookieValue" || cookies == "SessionCookieName=CookieValue; PersistentCookieName=CookieValue");
>+    EXPECT_TRUE(cookies == "PersistentCookieName=CookieValue; SessionCookieName=CookieValue" || cookies == "SessionCookieName=CookieValue; PersistentCookieName=CookieValue");
>     finished = true;
>     completionHandler();
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 185831: 340990 | 341206 | 341464