<!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>[175232] trunk</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/175232">175232</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-10-27 14:59:52 -0700 (Mon, 27 Oct 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>http/tests/cookies/third-party-cookie-relaxing.html is flaky on bots
https://bugs.webkit.org/show_bug.cgi?id=138098

Reviewed by Anders Carlsson.

Source/WebCore:

* platform/network/cf/NetworkStorageSessionCFNet.cpp:
(WebCore::NetworkStorageSession::switchToNewTestingSession):
Create a separate session for each WKTR/DRT process when testing.

Source/WebKit2:

* NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
* WebProcess/com.apple.WebProcess.sb.in:
Update for the new name of testing session. Memory regions are now of the form
&quot;WebKit Test-&lt;pid&gt;-0&quot;.

LayoutTests:

* platform/mac-wk1/TestExpectations: Removed the test from expectations. It's still
skipped on WK2, because we don't yet implement the necessary WKTR functionality.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfNetworkStorageSessionCFNetcpp">trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmaccomappleWebKitNetworkProcesssbin">trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscomappleWebProcesssbin">trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (175231 => 175232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-10-27 21:08:51 UTC (rev 175231)
+++ trunk/LayoutTests/ChangeLog        2014-10-27 21:59:52 UTC (rev 175232)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2014-10-27  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        http/tests/cookies/third-party-cookie-relaxing.html is flaky on bots
+        https://bugs.webkit.org/show_bug.cgi?id=138098
+
+        Reviewed by Anders Carlsson.
+
+        * platform/mac-wk1/TestExpectations: Removed the test from expectations. It's still
+        skipped on WK2, because we don't yet implement the necessary WKTR functionality.
+
+2014-10-27  Alexey Proskuryakov  &lt;ap@apple.com&gt;
+
</ins><span class="cx">         Add [ Yosemite ] modifier to a couple of tests in section 7.
</span><span class="cx"> 
</span><span class="cx">         These two tests fail with PPT, so they are expected to pass on 10.8. Our current
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (175231 => 175232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations        2014-10-27 21:08:51 UTC (rev 175231)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations        2014-10-27 21:59:52 UTC (rev 175232)
</span><span class="lines">@@ -19,10 +19,6 @@
</span><span class="cx"> webkit.org/b/132421 fast/multicol/fixed-stack.html [ ImageOnlyFailure ]
</span><span class="cx"> [ MountainLion Mavericks ] fast/multicol/fixed-stack.html [ Pass ]
</span><span class="cx"> 
</span><del>-# Failing itermittently on Yosemite Release WK1 bots. 
-webkit.org/b/138098 http/tests/cookies/third-party-cookie-relaxing.html [ Pass Failure ]
-[ MountainLion Mavericks ] http/tests/cookies/third-party-cookie-relaxing.html [ Pass ]
-
</del><span class="cx"> ### END OF (1) Failures with bug reports
</span><span class="cx"> ########################################
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175231 => 175232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-10-27 21:08:51 UTC (rev 175231)
+++ trunk/Source/WebCore/ChangeLog        2014-10-27 21:59:52 UTC (rev 175232)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-10-27  Alexey Proskuryakov  &lt;ap@apple.com&gt;
+
+        http/tests/cookies/third-party-cookie-relaxing.html is flaky on bots
+        https://bugs.webkit.org/show_bug.cgi?id=138098
+
+        Reviewed by Anders Carlsson.
+
+        * platform/network/cf/NetworkStorageSessionCFNet.cpp:
+        (WebCore::NetworkStorageSession::switchToNewTestingSession):
+        Create a separate session for each WKTR/DRT process when testing.
+
</ins><span class="cx"> 2014-10-27  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Use separate HashMaps for common and uncommon headers in HTTPHeaderMap
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfNetworkStorageSessionCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp (175231 => 175232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp        2014-10-27 21:08:51 UTC (rev 175231)
+++ trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp        2014-10-27 21:59:52 UTC (rev 175232)
</span><span class="lines">@@ -53,12 +53,12 @@
</span><span class="cx"> 
</span><span class="cx"> void NetworkStorageSession::switchToNewTestingSession()
</span><span class="cx"> {
</span><del>-    // Set a private session for testing to avoid interfering with global cookies. This should be different from private browsing session.
-    // FIXME: It looks like creating a new session with the same identifier may be just creating a reference to the same storage. See &lt;rdar://problem/11571450&gt; and &lt;rdar://problem/12384380&gt;.
</del><ins>+    // Session name should be short enough for shared memory region name to be under the limit, otehrwise sandbox rules won't work (see &lt;rdar://problem/13642852&gt;).
+    String sessionName = String::format(&quot;WebKit Test-%u&quot;, static_cast&lt;uint32_t&gt;(getpid()));
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><del>-    defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(CFSTR(&quot;Private WebKit Session&quot;)))));
</del><ins>+    defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(sessionName.createCFString().get()))));
</ins><span class="cx"> #else
</span><del>-    defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(CFSTR(&quot;Private WebKit Session&quot;), defaultNetworkStorageSession()-&gt;platformSession()))));
</del><ins>+    defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(sessionName.createCFString().get(), defaultNetworkStorageSession()-&gt;platformSession()))));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175231 => 175232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-10-27 21:08:51 UTC (rev 175231)
+++ trunk/Source/WebKit2/ChangeLog        2014-10-27 21:59:52 UTC (rev 175232)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-27  Alexey Proskuryakov  &lt;ap@apple.com&gt;
+
+        http/tests/cookies/third-party-cookie-relaxing.html is flaky on bots
+        https://bugs.webkit.org/show_bug.cgi?id=138098
+
+        Reviewed by Anders Carlsson.
+
+        * NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
+        * WebProcess/com.apple.WebProcess.sb.in:
+        Update for the new name of testing session. Memory regions are now of the form
+        &quot;WebKit Test-&lt;pid&gt;-0&quot;.
+
</ins><span class="cx"> 2014-10-27  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Use separate HashMaps for common and uncommon headers in HTTPHeaderMap
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmaccomappleWebKitNetworkProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in (175231 => 175232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in        2014-10-27 21:08:51 UTC (rev 175231)
+++ trunk/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in        2014-10-27 21:59:52 UTC (rev 175232)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> (allow ipc-posix-shm-read-data
</span><span class="cx">     (ipc-posix-name &quot;FNetwork.defaultStorageSession&quot;)
</span><span class="cx">     (ipc-posix-name-regex #&quot;\.PrivateBrowsing-&quot;)
</span><del>-    (ipc-posix-name-regex #&quot;^Private WebKit Session-&quot;))
</del><ins>+    (ipc-posix-name-regex #&quot;^WebKit Test-&quot;))
</ins><span class="cx"> 
</span><span class="cx"> ;; Various services required by CFNetwork and other frameworks
</span><span class="cx"> (allow mach-lookup
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscomappleWebProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in (175231 => 175232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in        2014-10-27 21:08:51 UTC (rev 175231)
+++ trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in        2014-10-27 21:59:52 UTC (rev 175232)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> (allow ipc-posix-shm-read-data
</span><span class="cx">     (ipc-posix-name &quot;FNetwork.defaultStorageSession&quot;)
</span><span class="cx">     (ipc-posix-name-regex #&quot;\.PrivateBrowsing-&quot;)
</span><del>-    (ipc-posix-name-regex #&quot;^Private WebKit Session-&quot;))
</del><ins>+    (ipc-posix-name-regex #&quot;^WebKit Test-&quot;))
</ins><span class="cx"> 
</span><span class="cx"> ;; ColorSync
</span><span class="cx"> ;; FIXME: Remove names with underscores when possible (see &lt;rdar://problem/13072721&gt;).
</span></span></pre>
</div>
</div>

</body>
</html>