<!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>[211068] trunk/Source/WebKit2</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/211068">211068</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2017-01-23 15:37:42 -0800 (Mon, 23 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Maintain ordering when doing speculative loads
https://bugs.webkit.org/show_bug.cgi?id=167324
Reviewed by Chris Dumez.
We currently randomize the ordering of speculative loads because they are serialized as a hash map.
It would be better to load in the same order as the requests were originally issued as that is
likely to match the order the document needs them.
* NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
(WebKit::NetworkCache::SpeculativeLoadManager::startSpeculativeRevalidation):
* NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp:
(WebKit::NetworkCache::SubresourceInfo::encode):
(WebKit::NetworkCache::SubresourceInfo::decode):
Include key into SubresourceInfo.
(WebKit::NetworkCache::makeSubresourcesVector):
Deduplicate the entries.
(WebKit::NetworkCache::SubresourcesEntry::SubresourcesEntry):
(WebKit::NetworkCache::SubresourcesEntry::updateSubresourceLoads):
* NetworkProcess/cache/NetworkCacheSubresourcesEntry.h:
(WebKit::NetworkCache::SubresourceInfo::SubresourceInfo):
(WebKit::NetworkCache::SubresourceInfo::key):
(WebKit::NetworkCache::SubresourceInfo::setTransient):
(WebKit::NetworkCache::SubresourcesEntry::subresources):
Keep the resources in a Vector instead of a HashMap to maintain order.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSubresourcesEntrycpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSubresourcesEntryh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSubresourcesEntry.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211067 => 211068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-23 23:26:55 UTC (rev 211067)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-23 23:37:42 UTC (rev 211068)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2017-01-23 Antti Koivisto <antti@apple.com>
+
+ Maintain ordering when doing speculative loads
+ https://bugs.webkit.org/show_bug.cgi?id=167324
+
+ Reviewed by Chris Dumez.
+
+ We currently randomize the ordering of speculative loads because they are serialized as a hash map.
+ It would be better to load in the same order as the requests were originally issued as that is
+ likely to match the order the document needs them.
+
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
+ (WebKit::NetworkCache::SpeculativeLoadManager::startSpeculativeRevalidation):
+ * NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp:
+ (WebKit::NetworkCache::SubresourceInfo::encode):
+ (WebKit::NetworkCache::SubresourceInfo::decode):
+
+ Include key into SubresourceInfo.
+
+ (WebKit::NetworkCache::makeSubresourcesVector):
+
+ Deduplicate the entries.
+
+ (WebKit::NetworkCache::SubresourcesEntry::SubresourcesEntry):
+ (WebKit::NetworkCache::SubresourcesEntry::updateSubresourceLoads):
+ * NetworkProcess/cache/NetworkCacheSubresourcesEntry.h:
+ (WebKit::NetworkCache::SubresourceInfo::SubresourceInfo):
+ (WebKit::NetworkCache::SubresourceInfo::key):
+ (WebKit::NetworkCache::SubresourceInfo::setTransient):
+ (WebKit::NetworkCache::SubresourcesEntry::subresources):
+
+ Keep the resources in a Vector instead of a HashMap to maintain order.
+
</ins><span class="cx"> 2017-01-23 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Pass down website autoplay policies to media elements
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (211067 => 211068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2017-01-23 23:26:55 UTC (rev 211067)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2017-01-23 23:37:42 UTC (rev 211068)
</span><span class="lines">@@ -514,9 +514,8 @@
</span><span class="cx">
</span><span class="cx"> void SpeculativeLoadManager::startSpeculativeRevalidation(const GlobalFrameID& frameID, SubresourcesEntry& entry)
</span><span class="cx"> {
</span><del>- for (auto& subresourcePair : entry.subresources()) {
- auto& key = subresourcePair.key;
- auto& subresourceInfo = subresourcePair.value;
</del><ins>+ for (auto& subresourceInfo : entry.subresources()) {
+ auto& key = subresourceInfo.key();
</ins><span class="cx"> if (!subresourceInfo.isTransient())
</span><span class="cx"> preloadEntry(key, subresourceInfo, frameID);
</span><span class="cx"> else {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSubresourcesEntrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp (211067 => 211068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp 2017-01-23 23:26:55 UTC (rev 211067)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp 2017-01-23 23:37:42 UTC (rev 211068)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx">
</span><span class="cx"> void SubresourceInfo::encode(WTF::Persistence::Encoder& encoder) const
</span><span class="cx"> {
</span><ins>+ encoder << m_key;
</ins><span class="cx"> encoder << m_isTransient;
</span><span class="cx">
</span><span class="cx"> // Do not bother serializing other data members of transient resources as they are empty.
</span><span class="lines">@@ -49,6 +50,9 @@
</span><span class="cx">
</span><span class="cx"> bool SubresourceInfo::decode(WTF::Persistence::Decoder& decoder, SubresourceInfo& info)
</span><span class="cx"> {
</span><ins>+ if (!decoder.decode(info.m_key))
+ return false;
+
</ins><span class="cx"> if (!decoder.decode(info.m_isTransient))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -99,24 +103,42 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_key.type() == "SubResources");
</span><span class="cx"> }
</span><ins>+
+static Vector<SubresourceInfo> makeSubresourceInfoVector(const Vector<std::unique_ptr<SubresourceLoad>>& subresourceLoads)
+{
+ Vector<SubresourceInfo> result;
+ result.reserveCapacity(subresourceLoads.size());
+
+ HashSet<Key> seenKeys;
+ for (auto& load : subresourceLoads) {
+ if (!seenKeys.add(load->key).isNewEntry)
+ continue;
+ result.append({ load->key, load->request });
+ }
</ins><span class="cx">
</span><ins>+ return result;
+}
+
</ins><span class="cx"> SubresourcesEntry::SubresourcesEntry(Key&& key, const Vector<std::unique_ptr<SubresourceLoad>>& subresourceLoads)
</span><span class="cx"> : m_key(WTFMove(key))
</span><span class="cx"> , m_timeStamp(std::chrono::system_clock::now())
</span><ins>+ , m_subresources(makeSubresourceInfoVector(subresourceLoads))
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_key.type() == "SubResources");
</span><del>- for (auto& subresourceLoad : subresourceLoads)
- m_subresources.add(subresourceLoad->key, SubresourceInfo(subresourceLoad->request));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SubresourcesEntry::updateSubresourceLoads(const Vector<std::unique_ptr<SubresourceLoad>>& subresourceLoads)
</span><span class="cx"> {
</span><del>- auto oldSubresources = WTFMove(m_subresources);
</del><ins>+ HashSet<Key> previousKeys;
+ for (auto& info : m_subresources)
+ previousKeys.add(info.key());
+
+ m_subresources = makeSubresourceInfoVector(subresourceLoads);
</ins><span class="cx">
</span><del>- // Mark keys that are common with last load as non-Transient.
- for (auto& subresourceLoad : subresourceLoads) {
- bool isTransient = !oldSubresources.contains(subresourceLoad->key);
- m_subresources.add(subresourceLoad->key, SubresourceInfo(subresourceLoad->request, isTransient));
</del><ins>+ // Mark keys that are not common with the last load as transient.
+ for (auto& subresourceInfo : m_subresources) {
+ if (!previousKeys.contains(subresourceInfo.key()))
+ subresourceInfo.setTransient();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSubresourcesEntryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSubresourcesEntry.h (211067 => 211068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSubresourcesEntry.h 2017-01-23 23:26:55 UTC (rev 211067)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSubresourcesEntry.h 2017-01-23 23:37:42 UTC (rev 211068)
</span><span class="lines">@@ -43,21 +43,25 @@
</span><span class="cx"> static bool decode(WTF::Persistence::Decoder&, SubresourceInfo&);
</span><span class="cx">
</span><span class="cx"> SubresourceInfo() = default;
</span><del>- SubresourceInfo(const WebCore::ResourceRequest& request, bool isTransient = false)
- : m_isTransient(isTransient)
- , m_firstPartyForCookies(isTransient ? WebCore::URL() : request.firstPartyForCookies())
- , m_requestHeaders(isTransient ? WebCore::HTTPHeaderMap() : request.httpHeaderFields())
</del><ins>+ SubresourceInfo(const Key& key, const WebCore::ResourceRequest& request)
+ : m_key(key)
+ , m_firstPartyForCookies(request.firstPartyForCookies())
+ , m_requestHeaders(request.httpHeaderFields())
</ins><span class="cx"> , m_priority(request.priority())
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ const Key& key() const { return m_key; }
</ins><span class="cx"> bool isTransient() const { return m_isTransient; }
</span><span class="cx"> const WebCore::URL& firstPartyForCookies() const { ASSERT(!m_isTransient); return m_firstPartyForCookies; }
</span><span class="cx"> const WebCore::HTTPHeaderMap& requestHeaders() const { ASSERT(!m_isTransient); return m_requestHeaders; }
</span><span class="cx"> WebCore::ResourceLoadPriority priority() const { ASSERT(!m_isTransient); return m_priority; }
</span><ins>+
+ void setTransient() { m_isTransient = true; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- bool m_isTransient { true };
</del><ins>+ Key m_key;
+ bool m_isTransient { false };
</ins><span class="cx"> WebCore::URL m_firstPartyForCookies;
</span><span class="cx"> WebCore::HTTPHeaderMap m_requestHeaders;
</span><span class="cx"> WebCore::ResourceLoadPriority m_priority;
</span><span class="lines">@@ -86,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> const Key& key() const { return m_key; }
</span><span class="cx"> std::chrono::system_clock::time_point timeStamp() const { return m_timeStamp; }
</span><del>- const HashMap<Key, SubresourceInfo>& subresources() const { return m_subresources; }
</del><ins>+ const Vector<SubresourceInfo>& subresources() const { return m_subresources; }
</ins><span class="cx">
</span><span class="cx"> void updateSubresourceLoads(const Vector<std::unique_ptr<SubresourceLoad>>&);
</span><span class="cx">
</span><span class="lines">@@ -93,7 +97,7 @@
</span><span class="cx"> private:
</span><span class="cx"> Key m_key;
</span><span class="cx"> std::chrono::system_clock::time_point m_timeStamp;
</span><del>- HashMap<Key, SubresourceInfo> m_subresources;
</del><ins>+ Vector<SubresourceInfo> m_subresources;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>