Title: [234561] trunk
Revision
234561
Author
[email protected]
Date
2018-08-03 16:01:35 -0700 (Fri, 03 Aug 2018)

Log Message

Unreviewed, rolling out r234517.

Caused API test failures on iOS

Reverted changeset:

"[Cocoa] setCookie API fails to set session cookies for
defaultDataStore if processPool created but not used"
https://bugs.webkit.org/show_bug.cgi?id=188209
https://trac.webkit.org/changeset/234517

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (234560 => 234561)


--- trunk/Source/WebKit/ChangeLog	2018-08-03 22:50:15 UTC (rev 234560)
+++ trunk/Source/WebKit/ChangeLog	2018-08-03 23:01:35 UTC (rev 234561)
@@ -1,3 +1,16 @@
+2018-08-03  David Fenton  <[email protected]>
+
+        Unreviewed, rolling out r234517.
+
+        Caused API test failures on iOS
+
+        Reverted changeset:
+
+        "[Cocoa] setCookie API fails to set session cookies for
+        defaultDataStore if processPool created but not used"
+        https://bugs.webkit.org/show_bug.cgi?id=188209
+        https://trac.webkit.org/changeset/234517
+
 2018-08-03  Ben Richards  <[email protected]>
 
         Add configuration for automatic process pre-warming

Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (234560 => 234561)


--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp	2018-08-03 22:50:15 UTC (rev 234560)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp	2018-08-03 23:01:35 UTC (rev 234561)
@@ -490,9 +490,6 @@
         parameters.defaultSessionParameters.sessionID = PAL::SessionID::defaultSessionID();
     }
 
-    if (!m_websiteDataStore && API::WebsiteDataStore::defaultDataStoreExists())
-        m_websiteDataStore = API::WebsiteDataStore::defaultDataStore().ptr();
-
     if (m_websiteDataStore) {
         parameters.defaultSessionPendingCookies = copyToVector(m_websiteDataStore->websiteDataStore().pendingCookies());
         m_websiteDataStore->websiteDataStore().clearPendingCookies();

Modified: trunk/Tools/ChangeLog (234560 => 234561)


--- trunk/Tools/ChangeLog	2018-08-03 22:50:15 UTC (rev 234560)
+++ trunk/Tools/ChangeLog	2018-08-03 23:01:35 UTC (rev 234561)
@@ -1,3 +1,16 @@
+2018-08-03  David Fenton  <[email protected]>
+
+        Unreviewed, rolling out r234517.
+
+        Caused API test failures on iOS
+
+        Reverted changeset:
+
+        "[Cocoa] setCookie API fails to set session cookies for
+        defaultDataStore if processPool created but not used"
+        https://bugs.webkit.org/show_bug.cgi?id=188209
+        https://trac.webkit.org/changeset/234517
+
 2018-08-03  Ben Richards  <[email protected]>
 
         Add configuration for automatic process pre-warming

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm (234560 => 234561)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm	2018-08-03 22:50:15 UTC (rev 234560)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm	2018-08-03 23:01:35 UTC (rev 234561)
@@ -534,10 +534,6 @@
     TestWebKitAPI::Util::run(&finished);
     
     // DefaultDataStore
-    configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
-    auto processPool = adoptNS([[WKProcessPool alloc] init]);
-    [configuration setProcessPool:processPool.get()];
-
     auto defaultStore = [WKWebsiteDataStore defaultDataStore];
     finished = false;
     [defaultStore removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] modifiedSince:[NSDate distantPast] completionHandler:[] {
@@ -564,6 +560,7 @@
     TestWebKitAPI::Util::run(&finished);
 
     finished = false;
+    configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
     configuration.get().websiteDataStore = defaultStore;
     webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
     webView.get().UIDelegate = delegate.get();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to