<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[234760] branches/safari-606.1.36.0-branch</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/234760">234760</a></dd>
<dt>Author</dt> <dd>kocsen_chung@apple.com</dd>
<dt>Date</dt> <dd>2018-08-10 09:46:21 -0700 (Fri, 10 Aug 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/234730">r234730</a>. rdar://problem/43144157

    REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/232083">r232083</a>): WKWebView loses first-party cookies on iOS
    https://bugs.webkit.org/show_bug.cgi?id=188443
    <rdar://problem/42991584>

    Patch by Sihui Liu <sihui_liu@apple.com> on 2018-08-09
    Reviewed by Chris Dumez.

    Source/WebKit:

    Revert the change to set sharedCookieStorage for iOS as it is breaking Kayak.

    * 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):

    Tools:

    Skip WebKit.WKHTTPCookieStoreWithoutProcessPool on iOS.

    * TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234730 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6061360branchSourceWebKitChangeLog">branches/safari-606.1.36.0-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari6061360branchSourceWebKitNetworkProcessNetworkProcessh">branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#branchessafari6061360branchSourceWebKitNetworkProcessNetworkProcessCreationParameterscpp">branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp</a></li>
<li><a href="#branchessafari6061360branchSourceWebKitNetworkProcessNetworkProcessCreationParametersh">branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h</a></li>
<li><a href="#branchessafari6061360branchSourceWebKitNetworkProcesscocoaNetworkProcessCocoamm">branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#branchessafari6061360branchSourceWebKitSharedWebProcessCreationParameterscpp">branches/safari-606.1.36.0-branch/Source/WebKit/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#branchessafari6061360branchSourceWebKitSharedWebProcessCreationParametersh">branches/safari-606.1.36.0-branch/Source/WebKit/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#branchessafari6061360branchSourceWebKitUIProcessCocoaWebProcessPoolCocoamm">branches/safari-606.1.36.0-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#branchessafari6061360branchToolsChangeLog">branches/safari-606.1.36.0-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6061360branchToolsTestWebKitAPITestsWebKitCocoaWKHTTPCookieStoremm">branches/safari-606.1.36.0-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6061360branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-606.1.36.0-branch/Source/WebKit/ChangeLog (234759 => 234760)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606.1.36.0-branch/Source/WebKit/ChangeLog        2018-08-10 16:45:57 UTC (rev 234759)
+++ branches/safari-606.1.36.0-branch/Source/WebKit/ChangeLog   2018-08-10 16:46:21 UTC (rev 234760)
</span><span class="lines">@@ -1,3 +1,66 @@
</span><ins>+2018-08-10  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r234730. rdar://problem/43144157
+
+    REGRESSION (r232083): WKWebView loses first-party cookies on iOS
+    https://bugs.webkit.org/show_bug.cgi?id=188443
+    <rdar://problem/42991584>
+    
+    Patch by Sihui Liu <sihui_liu@apple.com> on 2018-08-09
+    Reviewed by Chris Dumez.
+    
+    Source/WebKit:
+    
+    Revert the change to set sharedCookieStorage for iOS as it is breaking Kayak.
+    
+    * 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):
+    
+    Tools:
+    
+    Skip WebKit.WKHTTPCookieStoreWithoutProcessPool on iOS.
+    
+    * TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234730 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-08-09  Sihui Liu  <sihui_liu@apple.com>
+
+            REGRESSION (r232083): WKWebView loses first-party cookies on iOS
+            https://bugs.webkit.org/show_bug.cgi?id=188443
+            <rdar://problem/42991584>
+
+            Reviewed by Chris Dumez.
+
+            Revert the change to set sharedCookieStorage for iOS as it is breaking Kayak.
+
+            * 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):
+
</ins><span class="cx"> 2018-08-01  Babak Shafiei  <bshafiei@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r234486. rdar://problem/42844004
</span></span></pre></div>
<a id="branchessafari6061360branchSourceWebKitNetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/NetworkProcess.h (234759 => 234760)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/NetworkProcess.h  2018-08-10 16:45:57 UTC (rev 234759)
+++ branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/NetworkProcess.h     2018-08-10 16:46:21 UTC (rev 234760)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx">     void setNetworkProxySettings(const WebCore::SoupNetworkProxySettings&);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">     static void setSharedHTTPCookieStorage(const Vector<uint8_t>& identifier);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6061360branchSourceWebKitNetworkProcessNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (234759 => 234760)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp      2018-08-10 16:45:57 UTC (rev 234759)
+++ branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2018-08-10 16:46:21 UTC (rev 234760)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
</span><span class="cx">     encoder << shouldEnableNetworkCacheSpeculativeRevalidation;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">     encoder << uiProcessCookieStorageIdentifier;
</span><span class="cx"> #endif
</span><span class="cx">     encoder << defaultSessionPendingCookies;
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">     if (!decoder.decode(result.shouldEnableNetworkCacheSpeculativeRevalidation))
</span><span class="cx">         return false;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">     if (!decoder.decode(result.uiProcessCookieStorageIdentifier))
</span><span class="cx">         return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6061360branchSourceWebKitNetworkProcessNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (234759 => 234760)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h        2018-08-10 16:45:57 UTC (rev 234759)
+++ branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h   2018-08-10 16:46:21 UTC (rev 234760)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
</span><span class="cx">     bool shouldEnableNetworkCacheSpeculativeRevalidation { false };
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">     Vector<uint8_t> uiProcessCookieStorageIdentifier;
</span><span class="cx"> #endif
</span><span class="cx">     Vector<WebCore::Cookie> defaultSessionPendingCookies;
</span></span></pre></div>
<a id="branchessafari6061360branchSourceWebKitNetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (234759 => 234760)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm      2018-08-10 16:45:57 UTC (rev 234759)
+++ branches/safari-606.1.36.0-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2018-08-10 16:46:21 UTC (rev 234760)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> 
</span><span class="cx">     initializeNetworkSettings();
</span><span class="cx"> 
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">     setSharedHTTPCookieStorage(parameters.uiProcessCookieStorageIdentifier);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> void NetworkProcess::setSharedHTTPCookieStorage(const Vector<uint8_t>& identifier)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
</span></span></pre></div>
<a id="branchessafari6061360branchSourceWebKitSharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-606.1.36.0-branch/Source/WebKit/Shared/WebProcessCreationParameters.cpp (234759 => 234760)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606.1.36.0-branch/Source/WebKit/Shared/WebProcessCreationParameters.cpp  2018-08-10 16:45:57 UTC (rev 234759)
+++ branches/safari-606.1.36.0-branch/Source/WebKit/Shared/WebProcessCreationParameters.cpp     2018-08-10 16:46:21 UTC (rev 234760)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">     encoder << mediaCacheDirectoryExtensionHandle;
</span><span class="cx">     encoder << javaScriptConfigurationDirectory;
</span><span class="cx">     encoder << javaScriptConfigurationDirectoryExtensionHandle;
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">     encoder << uiProcessCookieStorageIdentifier;
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx">         return false;
</span><span class="cx">     parameters.javaScriptConfigurationDirectoryExtensionHandle = WTFMove(*javaScriptConfigurationDirectoryExtensionHandle);
</span><span class="cx"> 
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">     if (!decoder.decode(parameters.uiProcessCookieStorageIdentifier))
</span><span class="cx">         return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6061360branchSourceWebKitSharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: branches/safari-606.1.36.0-branch/Source/WebKit/Shared/WebProcessCreationParameters.h (234759 => 234760)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606.1.36.0-branch/Source/WebKit/Shared/WebProcessCreationParameters.h    2018-08-10 16:45:57 UTC (rev 234759)
+++ branches/safari-606.1.36.0-branch/Source/WebKit/Shared/WebProcessCreationParameters.h       2018-08-10 16:46:21 UTC (rev 234760)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">     SandboxExtension::Handle mediaCacheDirectoryExtensionHandle;
</span><span class="cx">     String javaScriptConfigurationDirectory;
</span><span class="cx">     SandboxExtension::Handle javaScriptConfigurationDirectoryExtensionHandle;
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">     Vector<uint8_t> uiProcessCookieStorageIdentifier;
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="branchessafari6061360branchSourceWebKitUIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-606.1.36.0-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (234759 => 234760)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606.1.36.0-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm   2018-08-10 16:45:57 UTC (rev 234759)
+++ branches/safari-606.1.36.0-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm      2018-08-10 16:46:21 UTC (rev 234760)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx">     }
</span><span class="cx">     parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
</span><span class="cx"> 
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">     ASSERT(parameters.uiProcessCookieStorageIdentifier.isEmpty());
</span><span class="cx">     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
</span><span class="cx">     parameters.uiProcessCookieStorageIdentifier = identifyingDataFromCookieStorage([[NSHTTPCookieStorage sharedHTTPCookieStorage] _cookieStorage]);
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx">     parameters.shouldSuppressMemoryPressureHandler = [defaults boolForKey:WebKitSuppressMemoryPressureHandlerDefaultsKey];
</span><span class="cx">     parameters.loadThrottleLatency = Seconds { [defaults integerForKey:WebKitNetworkLoadThrottleLatencyMillisecondsDefaultsKey] / 1000. };
</span><span class="cx"> 
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">     ASSERT(parameters.uiProcessCookieStorageIdentifier.isEmpty());
</span><span class="cx">     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
</span><span class="cx">     parameters.uiProcessCookieStorageIdentifier = identifyingDataFromCookieStorage([[NSHTTPCookieStorage sharedHTTPCookieStorage] _cookieStorage]);
</span></span></pre></div>
<a id="branchessafari6061360branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-606.1.36.0-branch/Tools/ChangeLog (234759 => 234760)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606.1.36.0-branch/Tools/ChangeLog        2018-08-10 16:45:57 UTC (rev 234759)
+++ branches/safari-606.1.36.0-branch/Tools/ChangeLog   2018-08-10 16:46:21 UTC (rev 234760)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2018-08-10  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r234730. rdar://problem/43144157
+
+    REGRESSION (r232083): WKWebView loses first-party cookies on iOS
+    https://bugs.webkit.org/show_bug.cgi?id=188443
+    <rdar://problem/42991584>
+    
+    Patch by Sihui Liu <sihui_liu@apple.com> on 2018-08-09
+    Reviewed by Chris Dumez.
+    
+    Source/WebKit:
+    
+    Revert the change to set sharedCookieStorage for iOS as it is breaking Kayak.
+    
+    * 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):
+    
+    Tools:
+    
+    Skip WebKit.WKHTTPCookieStoreWithoutProcessPool on iOS.
+    
+    * TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234730 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-08-09  Sihui Liu  <sihui_liu@apple.com>
+
+            REGRESSION (r232083): WKWebView loses first-party cookies on iOS
+            https://bugs.webkit.org/show_bug.cgi?id=188443
+            <rdar://problem/42991584>
+
+            Reviewed by Chris Dumez.
+
+            Skip WebKit.WKHTTPCookieStoreWithoutProcessPool on iOS.
+
+            * TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:
+
</ins><span class="cx"> 2018-08-03  Babak Shafiei  <bshafiei@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r234547. rdar://problem/42902608
</span></span></pre></div>
<a id="branchessafari6061360branchToolsTestWebKitAPITestsWebKitCocoaWKHTTPCookieStoremm"></a>
<div class="modfile"><h4>Modified: branches/safari-606.1.36.0-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm (234759 => 234760)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-606.1.36.0-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm     2018-08-10 16:45:57 UTC (rev 234759)
+++ branches/safari-606.1.36.0-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm        2018-08-10 16:46:21 UTC (rev 234760)
</span><span class="lines">@@ -476,6 +476,8 @@
</span><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+// FIXME: on iOS, UI process should be using the same cookie file as the network process for default session.
+#if PLATFORM(MAC)
</ins><span class="cx"> TEST(WebKit, WKHTTPCookieStoreWithoutProcessPool)
</span><span class="cx"> {
</span><span class="cx">     RetainPtr<NSHTTPCookie> sessionCookie = [NSHTTPCookie cookieWithProperties:@{
</span><span class="lines">@@ -567,4 +569,5 @@
</span><span class="cx">     [webView loadHTMLString:alertCookieHTML baseURL:[NSURL URLWithString:@"http://127.0.0.1"]];
</span><span class="cx">     TestWebKitAPI::Util::run(&finished);
</span><span class="cx"> }
</span><ins>+#endif // PLATFORM(MAC)
</ins><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>