<!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>[195399] branches/safari-601.1.46-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/195399">195399</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-01-20 23:11:18 -0800 (Wed, 20 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/195162">r195162</a>. rdar://problem/23978912</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreloaderDocumentLoadercpp">branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreloadercacheCachedRawResourceh">branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedRawResource.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestshttptestsloadingresourcesserverredirectresulthtml">branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/resources/server-redirect-result.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestshttptestsloadingresourcesserverredirectphp">branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/resources/server-redirect.php</a></li>
<li><a href="#branchessafari601146branchLayoutTestshttptestsloadingserverredirectforprovisionalloadcachingexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestshttptestsloadingserverredirectforprovisionalloadcachinghtml">branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (195398 => 195399)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-21 04:47:23 UTC (rev 195398)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-21 07:11:18 UTC (rev 195399)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-01-20 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r195162.
+
+ 2016-01-15 Jiewen Tan <jiewen_tan@apple.com>
+
+ FrameLoaderClient::didReceiveServerRedirectForProvisionalLoadForFrame() is never called when loading a main resource from the memory cache
+ https://bugs.webkit.org/show_bug.cgi?id=152520
+ <rdar://problem/23305737>
+
+ Reviewed by Andy Estes.
+
+ * http/tests/loading/resources/server-redirect-result.html: Added.
+ * http/tests/loading/resources/server-redirect.php: Added.
+ * http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt: Added.
+ * http/tests/loading/server-redirect-for-provisional-load-caching.html: Added.
+
</ins><span class="cx"> 2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r195158. rdar://problem/24208157
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestsloadingresourcesserverredirectresulthtmlfromrev195162trunkLayoutTestshttptestsloadingresourcesserverredirectresulthtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/resources/server-redirect-result.html (from rev 195162, trunk/LayoutTests/http/tests/loading/resources/server-redirect-result.html) (0 => 195399)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/resources/server-redirect-result.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/resources/server-redirect-result.html 2016-01-21 07:11:18 UTC (rev 195399)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE html>
+<script>
+if (parent.count == 0) {
+ parent.count = 1;
+ window.location = "server-redirect.php";
+}
+else if (parent.count == 1) {
+ if (parent.window.testRunner)
+ testRunner.notifyDone();
+}
+</script>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestsloadingresourcesserverredirectphpfromrev195162trunkLayoutTestshttptestsloadingresourcesserverredirectphp"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/resources/server-redirect.php (from rev 195162, trunk/LayoutTests/http/tests/loading/resources/server-redirect.php) (0 => 195399)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/resources/server-redirect.php (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/resources/server-redirect.php 2016-01-21 07:11:18 UTC (rev 195399)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<?php
+header("Location: server-redirect-result.html", true, 301);
+exit();
+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestsloadingserverredirectforprovisionalloadcachingexpectedtxtfromrev195162trunkLayoutTestshttptestsloadingserverredirectforprovisionalloadcachingexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt (from rev 195162, trunk/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt) (0 => 195399)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt 2016-01-21 07:11:18 UTC (rev 195399)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/server-redirect.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/server-redirect.php, main document URL http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html, http method GET> redirectResponse (null)
+main frame - didFinishDocumentLoadForFrame
+http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html - didFinishLoading
+http://127.0.0.1:8000/loading/resources/server-redirect.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/server-redirect-result.html, main document URL http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/server-redirect.php, http status code 301>
+frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/server-redirect.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/server-redirect-result.html, http status code 200>
+frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/server-redirect.php
+frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
+main frame - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/server-redirect.php - didFinishLoading
+frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/server-redirect.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/server-redirect.php, main document URL http://127.0.0.1:8000/loading/server-redirect-for-provisional-load-caching.html, http method GET> redirectResponse (null)
+frame "<!--framePath //<!--frame0-->-->" - didReceiveServerRedirectForProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/server-redirect.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/server-redirect-result.html, http status code 200>
+frame "<!--framePath //<!--frame0-->-->" - didCancelClientRedirectForFrame
+frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
+http://127.0.0.1:8000/loading/resources/server-redirect.php - didFinishLoading
+frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
+Test passes if the second redirection which is loaded from the cache dispatches didReceiveServerRedirectForProvisionalLoadForFrame.
+
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestsloadingserverredirectforprovisionalloadcachinghtmlfromrev195162trunkLayoutTestshttptestsloadingserverredirectforprovisionalloadcachinghtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching.html (from rev 195162, trunk/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching.html) (0 => 195399)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching.html 2016-01-21 07:11:18 UTC (rev 195399)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+var count = 0;
+
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpResourceLoadCallbacks();
+ testRunner.waitUntilDone();
+}
+</script>
+</head>
+<p>Test passes if the second redirection which is loaded from the cache dispatches didReceiveServerRedirectForProvisionalLoadForFrame.</p>
+<iframe src="./resources/server-redirect.php"></iframe>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (195398 => 195399)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-21 04:47:23 UTC (rev 195398)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-21 07:11:18 UTC (rev 195399)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-01-20 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r195162.
+
+ 2016-01-15 Jiewen Tan <jiewen_tan@apple.com>
+
+ FrameLoaderClient::didReceiveServerRedirectForProvisionalLoadForFrame() is never called when loading a main resource from the memory cache
+ https://bugs.webkit.org/show_bug.cgi?id=152520
+ <rdar://problem/23305737>
+
+ Reviewed by Andy Estes.
+
+ Test: http/tests/loading/server-redirect-for-provisional-load-caching.html
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::responseReceived):
+ Dispatch message to notify client that a cached resource was redirected. So,
+ client can make proper actions to treat server side redirection.
+ * loader/cache/CachedRawResource.h:
+ Add a method to tell whether the cached resource was redirected.
+
</ins><span class="cx"> 2016-01-20 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/24242600> CrashTracer: com.apple.WebKit.WebContent at …pector::CSSFrontendDispatcher::mediaQueryResultChanged + 316
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp (195398 => 195399)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp 2016-01-21 04:47:23 UTC (rev 195398)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp 2016-01-21 07:11:18 UTC (rev 195399)
</span><span class="lines">@@ -663,6 +663,10 @@
</span><span class="cx"> m_response = response;
</span><span class="cx">
</span><span class="cx"> if (m_identifierForLoadWithoutResourceLoader) {
</span><ins>+ if (m_mainResource && m_mainResource->wasRedirected()) {
+ ASSERT(m_mainResource->status() == CachedResource::Status::Cached);
+ frameLoader()->client().dispatchDidReceiveServerRedirectForProvisionalLoad();
+ }
</ins><span class="cx"> addResponse(m_response);
</span><span class="cx"> frameLoader()->notifier().dispatchDidReceiveResponse(this, m_identifierForLoadWithoutResourceLoader, m_response, 0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreloadercacheCachedRawResourceh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedRawResource.h (195398 => 195399)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedRawResource.h 2016-01-21 04:47:23 UTC (rev 195398)
+++ branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedRawResource.h 2016-01-21 07:11:18 UTC (rev 195399)
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx">
</span><span class="cx"> void clear();
</span><span class="cx">
</span><ins>+ bool wasRedirected() const { return !m_redirectChain.isEmpty(); };
+
</ins><span class="cx"> private:
</span><span class="cx"> virtual void didAddClient(CachedResourceClient*) override;
</span><span class="cx"> virtual void addDataBuffer(SharedBuffer&) override;
</span></span></pre>
</div>
</div>
</body>
</html>