<!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>[194974] branches/safari-601-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/194974">194974</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-13 12:17:43 -0800 (Wed, 13 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194898">r194898</a>. rdar://problem/24154290</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloadercacheCachedResourceLoadercpp">branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloadercacheCachedResourceLoaderh">branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsfastloadercacheencodingexpectedtxt">branches/safari-601-branch/LayoutTests/fast/loader/cache-encoding-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastloadercacheencodinghtml">branches/safari-601-branch/LayoutTests/fast/loader/cache-encoding.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastloaderresourcessuccessjs">branches/safari-601-branch/LayoutTests/fast/loader/resources/success.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (194973 => 194974)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-13 20:17:39 UTC (rev 194973)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-13 20:17:43 UTC (rev 194974)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-01-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194898. rdar://problem/24154290
+
+ 2016-01-12 Antti Koivisto <antti@apple.com>
+
+ Don't reuse memory cache entries with different charset
+ https://bugs.webkit.org/show_bug.cgi?id=110031
+
+ Reviewed by Andreas Kling.
+
+ * fast/loader/cache-encoding-expected.txt: Added.
+ * fast/loader/cache-encoding.html: Added.
+ * fast/loader/resources/success.js: Added.
+
+2016-01-13 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r194865. rdar://problem/24154291
</span><span class="cx">
</span><span class="cx"> 2016-01-11 Dave Hyatt <hyatt@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastloadercacheencodingexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/loader/cache-encoding-expected.txt (0 => 194974)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/loader/cache-encoding-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/loader/cache-encoding-expected.txt 2016-01-13 20:17:43 UTC (rev 194974)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+CONSOLE MESSAGE: line 1: SyntaxError: Invalid character '\u8307'
+First load a script with a wrong charset then again with the right one. Second attempt should work and 'scriptSuccess' should be set to true. 'successfullyParsed' will be undefined.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS scriptSuccess is true
+FAIL successfullyParsed should be true (of type boolean). Was undefined (of type undefined).
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastloadercacheencodinghtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/loader/cache-encoding.html (0 => 194974)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/loader/cache-encoding.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/loader/cache-encoding.html 2016-01-13 20:17:43 UTC (rev 194974)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<script src="../../resources/js-test-pre.js"></script>
+<script>
+jsTestIsAsync = true;
+
+description("First load a script with a wrong charset then again with the right one. Second attempt should work and 'scriptSuccess' should be set to true. 'successfullyParsed' will be undefined.");
+
+function appendScriptWithCharset(charset, onload)
+{
+ var script = document.createElement("script");
+ script.src = "resources/success.js";
+ script.setAttribute("charset", charset);
+ script.onload = onload;
+ script.onerror = onload;
+ document.body.appendChild(script);
+}
+
+function test()
+{
+ appendScriptWithCharset("utf-16", () => {
+ appendScriptWithCharset("utf-8", () => {
+ shouldBeTrue("scriptSuccess");
+ finishJSTest();
+ });
+ });
+}
+</script>
+<body onload="test()">
+<script src="../../resources/js-test-post.js"></script>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastloaderresourcessuccessjs"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/loader/resources/success.js (0 => 194974)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/loader/resources/success.js (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/loader/resources/success.js 2016-01-13 20:17:43 UTC (rev 194974)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+scriptSuccess = true;
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (194973 => 194974)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-13 20:17:39 UTC (rev 194973)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-13 20:17:43 UTC (rev 194974)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-01-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194898. rdar://problem/24154290
+
+ 2016-01-12 Antti Koivisto <antti@apple.com>
+
+ Don't reuse memory cache entries with different charset
+ https://bugs.webkit.org/show_bug.cgi?id=110031
+ rdar://problem/13666418
+
+ Reviewed by Andreas Kling.
+
+ Test: fast/loader/cache-encoding.html
+
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestResource):
+ (WebCore::logResourceRevalidationDecision):
+ (WebCore::CachedResourceLoader::determineRevalidationPolicy):
+
+ Pass full CachedResourceRequest to the function.
+ If charset differs don't reuse the cache entry.
+
+ * loader/cache/CachedResourceLoader.h:
+
+2016-01-13 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r194865. rdar://problem/24154291
</span><span class="cx">
</span><span class="cx"> 2016-01-11 Dave Hyatt <hyatt@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp (194973 => 194974)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-01-13 20:17:39 UTC (rev 194973)
+++ branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-01-13 20:17:43 UTC (rev 194974)
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx">
</span><span class="cx"> logMemoryCacheResourceRequest(frame(), resource ? DiagnosticLoggingKeys::inMemoryCacheKey() : DiagnosticLoggingKeys::notInMemoryCacheKey());
</span><span class="cx">
</span><del>- const RevalidationPolicy policy = determineRevalidationPolicy(type, request.mutableResourceRequest(), request.forPreload(), resource.get(), request.defer());
</del><ins>+ const RevalidationPolicy policy = determineRevalidationPolicy(type, request, resource.get());
</ins><span class="cx"> switch (policy) {
</span><span class="cx"> case Reload:
</span><span class="cx"> memoryCache.remove(*resource);
</span><span class="lines">@@ -681,13 +681,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CachedResourceLoader::RevalidationPolicy CachedResourceLoader::determineRevalidationPolicy(CachedResource::Type type, ResourceRequest& request, bool forPreload, CachedResource* existingResource, CachedResourceRequest::DeferOption defer) const
</del><ins>+CachedResourceLoader::RevalidationPolicy CachedResourceLoader::determineRevalidationPolicy(CachedResource::Type type, CachedResourceRequest& cachedResourceRequest, CachedResource* existingResource) const
</ins><span class="cx"> {
</span><ins>+ auto& request = cachedResourceRequest.resourceRequest();
+
</ins><span class="cx"> if (!existingResource)
</span><span class="cx"> return Load;
</span><span class="cx">
</span><span class="cx"> // We already have a preload going for this URL.
</span><del>- if (forPreload && existingResource->isPreloaded())
</del><ins>+ if (cachedResourceRequest.forPreload() && existingResource->isPreloaded())
</ins><span class="cx"> return Use;
</span><span class="cx">
</span><span class="cx"> // If the same URL has been loaded as a different type, we need to reload.
</span><span class="lines">@@ -699,13 +701,15 @@
</span><span class="cx">
</span><span class="cx"> if (!existingResource->canReuse(request))
</span><span class="cx"> return Reload;
</span><ins>+ if (existingResource->encoding() != TextEncoding(cachedResourceRequest.charset()))
+ return Reload;
</ins><span class="cx">
</span><span class="cx"> // Conditional requests should have failed canReuse check.
</span><span class="cx"> ASSERT(!request.isConditional());
</span><span class="cx">
</span><span class="cx"> // Do not load from cache if images are not enabled. The load for this image will be blocked
</span><span class="cx"> // in CachedImage::load.
</span><del>- if (CachedResourceRequest::DeferredByClient == defer)
</del><ins>+ if (cachedResourceRequest.defer() == CachedResourceRequest::DeferredByClient)
</ins><span class="cx"> return Reload;
</span><span class="cx">
</span><span class="cx"> // Don't reload resources while pasting.
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloadercacheCachedResourceLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.h (194973 => 194974)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.h 2016-01-13 20:17:39 UTC (rev 194973)
+++ branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.h 2016-01-13 20:17:43 UTC (rev 194974)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> void requestPreload(CachedResource::Type, CachedResourceRequest&, const String& charset);
</span><span class="cx">
</span><span class="cx"> enum RevalidationPolicy { Use, Revalidate, Reload, Load };
</span><del>- RevalidationPolicy determineRevalidationPolicy(CachedResource::Type, ResourceRequest&, bool forPreload, CachedResource* existingResource, CachedResourceRequest::DeferOption) const;
</del><ins>+ RevalidationPolicy determineRevalidationPolicy(CachedResource::Type, CachedResourceRequest&, CachedResource* existingResource) const;
</ins><span class="cx">
</span><span class="cx"> bool shouldContinueAfterNotifyingLoadedFromMemoryCache(const CachedResourceRequest&, CachedResource*);
</span><span class="cx"> bool checkInsecureContent(CachedResource::Type, const URL&) const;
</span></span></pre>
</div>
</div>
</body>
</html>