<!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>[199911] 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/199911">199911</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-04-22 14:40:39 -0700 (Fri, 22 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/199881">r199881</a>. rdar://problem/25879498</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="#branchessafari601branchSourceWebCoreloaderTextResourceDecodercpp">branches/safari-601-branch/Source/WebCore/loader/TextResourceDecoder.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloaderTextResourceDecoderh">branches/safari-601-branch/Source/WebCore/loader/TextResourceDecoder.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloadercacheCachedCSSStyleSheeth">branches/safari-601-branch/Source/WebCore/loader/cache/CachedCSSStyleSheet.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloadercacheCachedResourceh">branches/safari-601-branch/Source/WebCore/loader/cache/CachedResource.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloadercacheCachedResourceLoadercpp">branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloadercacheCachedSVGDocumenth">branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGDocument.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloadercacheCachedScripth">branches/safari-601-branch/Source/WebCore/loader/cache/CachedScript.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloadercacheCachedXSLStyleSheeth">branches/safari-601-branch/Source/WebCore/loader/cache/CachedXSLStyleSheet.h</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 (199910 => 199911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-04-22 21:32:25 UTC (rev 199910)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-04-22 21:40:39 UTC (rev 199911)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-04-22 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r199881. rdar://problem/25879498
+
+ 2016-04-22 Antti Koivisto <antti@apple.com>
+
+ REGRESSION (r194898): Multi download of external SVG defs file by <use> xlinks:href (caching)
+ https://bugs.webkit.org/show_bug.cgi?id=156368
+ <rdar://problem/25611746>
+
+ Reviewed by Simon Fraser.
+
+ * http/tests/svg/resources/symbol-defs.svg: Added.
+ * http/tests/svg/svg-use-external-expected.txt: Added.
+ * http/tests/svg/svg-use-external.html: Added.
+
</ins><span class="cx"> 2016-03-31 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Roll out r191180. rdar://problem/25448882
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (199910 => 199911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-04-22 21:32:25 UTC (rev 199910)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-04-22 21:40:39 UTC (rev 199911)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2016-04-22 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r199881. rdar://problem/25879498
+
+ 2016-04-22 Antti Koivisto <antti@apple.com>
+
+ REGRESSION (r194898): Multi download of external SVG defs file by <use> xlinks:href (caching)
+ https://bugs.webkit.org/show_bug.cgi?id=156368
+ <rdar://problem/25611746>
+
+ Reviewed by Simon Fraser.
+
+ We would load svg resources with fragment identifier again because the encoding never matched.
+
+ Test: http/tests/svg/svg-use-external.html
+
+ * loader/TextResourceDecoder.cpp:
+ (WebCore::TextResourceDecoder::setEncoding):
+ (WebCore::TextResourceDecoder::hasEqualEncodingForCharset):
+
+ Encoding can depend on mime type. Add a comparison function that takes this into account.
+
+ (WebCore::findXMLEncoding):
+ * loader/TextResourceDecoder.h:
+ (WebCore::TextResourceDecoder::encoding):
+ * loader/cache/CachedCSSStyleSheet.h:
+ * loader/cache/CachedResource.h:
+ (WebCore::CachedResource::textResourceDecoder):
+
+ Add a way to get the TextResourceDecoder from a cached resource.
+
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::determineRevalidationPolicy):
+
+ Use the new comparison function.
+
+ * loader/cache/CachedSVGDocument.h:
+ * loader/cache/CachedScript.h:
+ * loader/cache/CachedXSLStyleSheet.h:
+
</ins><span class="cx"> 2016-03-31 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Roll out r191180. rdar://problem/25448882
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloaderTextResourceDecodercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/TextResourceDecoder.cpp (199910 => 199911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/TextResourceDecoder.cpp 2016-04-22 21:32:25 UTC (rev 199910)
+++ branches/safari-601-branch/Source/WebCore/loader/TextResourceDecoder.cpp 2016-04-22 21:40:39 UTC (rev 199911)
</span><span class="lines">@@ -359,6 +359,11 @@
</span><span class="cx"> m_source = source;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool TextResourceDecoder::hasEqualEncodingForCharset(const String& charset) const
+{
+ return defaultEncoding(m_contentType, charset) == m_encoding;
+}
+
</ins><span class="cx"> // Returns the position of the encoding string.
</span><span class="cx"> static int findXMLEncoding(const char* str, int len, int& encodingLength)
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloaderTextResourceDecoderh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/TextResourceDecoder.h (199910 => 199911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/TextResourceDecoder.h 2016-04-22 21:32:25 UTC (rev 199910)
+++ branches/safari-601-branch/Source/WebCore/loader/TextResourceDecoder.h 2016-04-22 21:40:39 UTC (rev 199911)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> void setEncoding(const TextEncoding&, EncodingSource);
</span><span class="cx"> const TextEncoding& encoding() const { return m_encoding; }
</span><span class="cx">
</span><ins>+ bool hasEqualEncodingForCharset(const String&) const;
+
</ins><span class="cx"> WEBCORE_EXPORT String decode(const char* data, size_t length);
</span><span class="cx"> WEBCORE_EXPORT String flush();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloadercacheCachedCSSStyleSheeth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/cache/CachedCSSStyleSheet.h (199910 => 199911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2016-04-22 21:32:25 UTC (rev 199910)
+++ branches/safari-601-branch/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2016-04-22 21:40:39 UTC (rev 199911)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void setEncoding(const String&) override;
</span><span class="cx"> virtual String encoding() const override;
</span><ins>+ const TextResourceDecoder* textResourceDecoder() const override { return m_decoder.get(); }
</ins><span class="cx"> virtual void finishLoading(SharedBuffer*) override;
</span><span class="cx"> virtual void destroyDecodedData() override;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/cache/CachedResource.h (199910 => 199911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/cache/CachedResource.h 2016-04-22 21:32:25 UTC (rev 199910)
+++ branches/safari-601-branch/Source/WebCore/loader/cache/CachedResource.h 2016-04-22 21:40:39 UTC (rev 199911)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> class SecurityOrigin;
</span><span class="cx"> class SharedBuffer;
</span><span class="cx"> class SubresourceLoader;
</span><ins>+class TextResourceDecoder;
</ins><span class="cx">
</span><span class="cx"> // A resource that is held in the cache. Classes who want to use this object should derive
</span><span class="cx"> // from CachedResourceClient, to get the function calls in case the requested data has arrived.
</span><span class="lines">@@ -98,6 +99,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void setEncoding(const String&) { }
</span><span class="cx"> virtual String encoding() const { return String(); }
</span><ins>+ virtual const TextResourceDecoder* textResourceDecoder() const { return nullptr; }
</ins><span class="cx"> virtual void addDataBuffer(SharedBuffer&);
</span><span class="cx"> virtual void addData(const char* data, unsigned length);
</span><span class="cx"> virtual void finishLoading(SharedBuffer*);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp (199910 => 199911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-04-22 21:32:25 UTC (rev 199910)
+++ branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-04-22 21:40:39 UTC (rev 199911)
</span><span class="lines">@@ -701,7 +701,9 @@
</span><span class="cx">
</span><span class="cx"> if (!existingResource->canReuse(request))
</span><span class="cx"> return Reload;
</span><del>- if (existingResource->encoding() != TextEncoding(cachedResourceRequest.charset()))
</del><ins>+
+ auto* textDecoder = existingResource->textResourceDecoder();
+ if (textDecoder && !textDecoder->hasEqualEncodingForCharset(cachedResourceRequest.charset()))
</ins><span class="cx"> return Reload;
</span><span class="cx">
</span><span class="cx"> // Conditional requests should have failed canReuse check.
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloadercacheCachedSVGDocumenth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGDocument.h (199910 => 199911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGDocument.h 2016-04-22 21:32:25 UTC (rev 199910)
+++ branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGDocument.h 2016-04-22 21:40:39 UTC (rev 199911)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> virtual bool mayTryReplaceEncodedData() const override { return true; }
</span><span class="cx"> virtual void setEncoding(const String&) override;
</span><span class="cx"> virtual String encoding() const override;
</span><ins>+ const TextResourceDecoder* textResourceDecoder() const override { return m_decoder.get(); }
</ins><span class="cx"> virtual void finishLoading(SharedBuffer*) override;
</span><span class="cx">
</span><span class="cx"> RefPtr<SVGDocument> m_document;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloadercacheCachedScripth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/cache/CachedScript.h (199910 => 199911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/cache/CachedScript.h 2016-04-22 21:32:25 UTC (rev 199910)
+++ branches/safari-601-branch/Source/WebCore/loader/cache/CachedScript.h 2016-04-22 21:40:39 UTC (rev 199911)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void setEncoding(const String&) override;
</span><span class="cx"> virtual String encoding() const override;
</span><ins>+ const TextResourceDecoder* textResourceDecoder() const override { return m_decoder.get(); }
</ins><span class="cx"> virtual void finishLoading(SharedBuffer*) override;
</span><span class="cx">
</span><span class="cx"> virtual void destroyDecodedData() override;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloadercacheCachedXSLStyleSheeth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/cache/CachedXSLStyleSheet.h (199910 => 199911)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2016-04-22 21:32:25 UTC (rev 199910)
+++ branches/safari-601-branch/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2016-04-22 21:40:39 UTC (rev 199911)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> virtual void didAddClient(CachedResourceClient*) override;
</span><span class="cx"> virtual void setEncoding(const String&) override;
</span><span class="cx"> virtual String encoding() const override;
</span><ins>+ const TextResourceDecoder* textResourceDecoder() const override { return m_decoder.get(); }
</ins><span class="cx"> virtual void finishLoading(SharedBuffer*) override;
</span><span class="cx">
</span><span class="cx"> String m_sheet;
</span></span></pre>
</div>
</div>
</body>
</html>