Attachment 343377 Details for Bug 186806 – Patch for landing

[patch] Patch for landing

bug-186806-20180622154112.patch (text/plain), 4.58 KB, created by Sihui Liu on 2018-06-22 15:41:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2018-06-22 15:41:12 PDT

Size: 4.58 KB

patch

obsolete

>Subversion Revision: 233097
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 7d7cdce1dcd3ab75a0e2b0e227056d077c531b51..905538753dfbc62ea90bb12e3e70ea47167c4d6e 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-06-22  Sihui Liu  <sihui_liu@apple.com>
>+
>+        REGRESSION (r231850): Cookie file cannot be read or written by network process
>+        https://bugs.webkit.org/show_bug.cgi?id=186806
>+        <rdar://problem/41113791>
>+
>+        Unreviewed. Fix failure after r233084 by adding missing initialization.
>+
>+        * UIProcess/WebProcessPool.cpp:
>+        (WebKit::WebProcessPool::ensureNetworkProcess):
>+
> 2018-06-22  Brian Burg  <bburg@apple.com>
> 
>         [Cocoa] REGRESSION(W3C): actions for key equivalents are not respected
>diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
>index 8284da5ac6dddf94057fcc2df88786e7dbd9a443..bd377e46b671b739ef7c064089dedca8da4a0a64 100644
>--- a/Source/WebKit/UIProcess/WebProcessPool.cpp
>+++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
>@@ -466,7 +466,12 @@ NetworkProcessProxy& WebProcessPool::ensureNetworkProcess(WebsiteDataStore* with
>         // We should separate the concept of the default session from the currently used persistent session.
>         parameters.defaultSessionParameters.sessionID = PAL::SessionID::defaultSessionID();
>     }
>-    
>+
>+    if (m_websiteDataStore) {
>+        parameters.defaultSessionPendingCookies = copyToVector(m_websiteDataStore->websiteDataStore().pendingCookies());
>+        m_websiteDataStore->websiteDataStore().clearPendingCookies();
>+    }
>+
>     parameters.privateBrowsingEnabled = WebPreferences::anyPagesAreUsingPrivateBrowsing();
> 
>     parameters.cacheModel = cacheModel();
>diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme
>index 33165273772bee2aae68cb0f3fe8a9a942daa783..819f9792c3b930321f4c836079afb480a6d31470 100644
>--- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme	
>+++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme	
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <Scheme
>-   version = "1.7">
>+   version = "1.3">
>    <BuildAction
>       parallelizeBuildables = "NO"
>       buildImplicitDependencies = "YES">
>@@ -137,17 +137,16 @@
>       buildConfiguration = "Debug"
>       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
>       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
>-      language = ""
>       shouldUseLaunchSchemeArgsEnv = "YES">
>       <Testables>
>       </Testables>
>       <MacroExpansion>
>          <BuildableReference
>             BuildableIdentifier = "primary"
>-            BlueprintIdentifier = "8D1107260486CEB800E47090"
>-            BuildableName = "MiniBrowser.app"
>-            BlueprintName = "MiniBrowser"
>-            ReferencedContainer = "container:Tools/MiniBrowser/MiniBrowser.xcodeproj">
>+            BlueprintIdentifier = "8DD76F960486AA7600D96B5E"
>+            BuildableName = "TestWebKitAPI"
>+            BlueprintName = "TestWebKitAPI"
>+            ReferencedContainer = "container:Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj">
>          </BuildableReference>
>       </MacroExpansion>
>       <AdditionalOptions>
>@@ -157,7 +156,6 @@
>       buildConfiguration = "Debug"
>       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
>       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
>-      language = ""
>       launchStyle = "0"
>       useCustomWorkingDirectory = "NO"
>       ignoresPersistentStateOnLaunch = "YES"
>@@ -168,12 +166,18 @@
>          runnableDebuggingMode = "0">
>          <BuildableReference
>             BuildableIdentifier = "primary"
>-            BlueprintIdentifier = "8D1107260486CEB800E47090"
>-            BuildableName = "MiniBrowser.app"
>-            BlueprintName = "MiniBrowser"
>-            ReferencedContainer = "container:Tools/MiniBrowser/MiniBrowser.xcodeproj">
>+            BlueprintIdentifier = "8DD76F960486AA7600D96B5E"
>+            BuildableName = "TestWebKitAPI"
>+            BlueprintName = "TestWebKitAPI"
>+            ReferencedContainer = "container:Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj">
>          </BuildableReference>
>       </BuildableProductRunnable>
>+      <CommandLineArguments>
>+         <CommandLineArgument
>+            argument = "--gtest_filter=WebKit.WKHTTPCookieStoreWithoutProcessPool"
>+            isEnabled = "YES">
>+         </CommandLineArgument>
>+      </CommandLineArguments>
>       <AdditionalOptions>
>       </AdditionalOptions>
>    </LaunchAction>

Actions: View | Formatted Diff | Diff

Attachments on bug 186806: 343069 | 343101 | 343291 | 343377 | 343379