Changeset 252426 in webkit

Timestamp:

Nov 13, 2019, 1:11:09 PM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r252116. rdar://problem/57162237

Temporarily turn off NSURLSession isolation
​https://bugs.webkit.org/show_bug.cgi?id=201822

Reviewed by Chris Dumez.

Source/WebKit:

Existing tests skipped.

Re-enabling it is tracked in rdar://problem/56921584.

• NetworkProcess/cache/NetworkCacheStorage.h:

Bumps the version to force a clean cache.

• NetworkProcess/cocoa/NetworkDataTaskCocoa.mm: (WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):

Skips setting needsIsolatedSession.

LayoutTests:

Re-enabling it is tracked in rdar://problem/56921584.

• platform/wk2/TestExpectations:

Skipped the associated tests.

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

Location:

tags/Safari-609.1.9.5

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/wk2/TestExpectations (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.h (modified) (1 diff)
• Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (modified) (1 diff)

tags/Safari-609.1.9.5/LayoutTests/ChangeLog

@@ +1 @@
+2019-11-13  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r252116. rdar://problem/57162237
+
+    Temporarily turn off NSURLSession isolation
+    https://bugs.webkit.org/show_bug.cgi?id=201822
+    
+    Reviewed by Chris Dumez.
+    
+    Source/WebKit:
+    
+    Existing tests skipped.
+    
+    Re-enabling it is tracked in rdar://problem/56921584.
+    
+    * NetworkProcess/cache/NetworkCacheStorage.h:
+        Bumps the version to force a clean cache.
+    * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+    (WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
+        Skips setting needsIsolatedSession.
+    
+    LayoutTests:
+    
+    Re-enabling it is tracked in rdar://problem/56921584.
+    
+    * platform/wk2/TestExpectations:
+        Skipped the associated tests.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@252116 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-11-05  John Wilander  <wilander@apple.com>
+
+            Temporarily turn off NSURLSession isolation
+            https://bugs.webkit.org/show_bug.cgi?id=201822
+
+            Reviewed by Chris Dumez.
+
+            Re-enabling it is tracked in rdar://problem/56921584.
+
+            * platform/wk2/TestExpectations:
+                Skipped the associated tests.
+
 2019-10-30  Alan Coon  <alancoon@apple.com>
 

tags/Safari-609.1.9.5/LayoutTests/platform/wk2/TestExpectations

@@ -747 +747 @@
 http/tests/resourceLoadStatistics/cap-cache-max-age-for-prevalent-resource.html [ Skip ]
 
+# rdar://problem/56921584
+http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction.php [ Skip ]
+http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database.php [ Skip ]
+
 # This feature is currently disabled by default and unfinished <rdar://problem/38925077>.
 http/tests/navigation/process-swap-window-open.html [ Skip ]

tags/Safari-609.1.9.5/Source/WebKit/ChangeLog

@@ +1 @@
+2019-11-13  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r252116. rdar://problem/57162237
+
+    Temporarily turn off NSURLSession isolation
+    https://bugs.webkit.org/show_bug.cgi?id=201822
+    
+    Reviewed by Chris Dumez.
+    
+    Source/WebKit:
+    
+    Existing tests skipped.
+    
+    Re-enabling it is tracked in rdar://problem/56921584.
+    
+    * NetworkProcess/cache/NetworkCacheStorage.h:
+        Bumps the version to force a clean cache.
+    * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+    (WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
+        Skips setting needsIsolatedSession.
+    
+    LayoutTests:
+    
+    Re-enabling it is tracked in rdar://problem/56921584.
+    
+    * platform/wk2/TestExpectations:
+        Skipped the associated tests.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@252116 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-11-05  John Wilander  <wilander@apple.com>
+
+            Temporarily turn off NSURLSession isolation
+            https://bugs.webkit.org/show_bug.cgi?id=201822
+
+            Reviewed by Chris Dumez.
+
+            Existing tests skipped.
+
+            Re-enabling it is tracked in rdar://problem/56921584.
+
+            * NetworkProcess/cache/NetworkCacheStorage.h:
+                Bumps the version to force a clean cache.
+            * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+            (WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
+                Skips setting needsIsolatedSession.
+
 2019-11-01  Kocsen Chung  <kocsen_chung@apple.com>
 

tags/Safari-609.1.9.5/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.h

@@ -108 +108 @@
 
     // Incrementing this number will delete all existing cache content for everyone. Do you really need to do it?
-    static const unsigned version = 14;
+    static const unsigned version = 15;
 #if PLATFORM(MAC)
     /// Allow the last stable version of the cache to co-exist with the latest development one.

tags/Safari-609.1.9.5/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm

@@ -214 +214 @@
         if (!shouldBlockCookies)
             shouldBlockCookies = networkStorageSession->shouldBlockCookies(request, frameID, pageID);
-        needsIsolatedSession = networkStorageSession->shouldBlockThirdPartyCookiesButKeepFirstPartyCookiesFor(firstParty);
+        // FIXME: <rdar://problem/56921584> needsIsolatedSession should be set here.
     }
 #endif