<!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>[201376] 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/201376">201376</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-05-25 03:59:06 -0700 (Wed, 25 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update constructRevalidationRequest() to stop returning a unique_ptr<ResourceRequest>
https://bugs.webkit.org/show_bug.cgi?id=158046
Reviewed by Darin Adler.
Update constructRevalidationRequest() to stop returning a unique_ptr<ResourceRequest>
and to return a ResourceRequest instead. There is no reason for it to return a
pointer.
* NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
(WebKit::NetworkCache::constructRevalidationRequest):
(WebKit::NetworkCache::SpeculativeLoadManager::PreloadedEntry::PreloadedEntry):
(WebKit::NetworkCache::SpeculativeLoadManager::PreloadedEntry::revalidationRequest):
(WebKit::NetworkCache::SpeculativeLoadManager::addPreloadedEntry):
(WebKit::NetworkCache::SpeculativeLoadManager::revalidateEntry):
* NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h:</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="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagerh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201375 => 201376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-25 10:58:30 UTC (rev 201375)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-25 10:59:06 UTC (rev 201376)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-05-25 Chris Dumez <cdumez@apple.com>
+
+ Update constructRevalidationRequest() to stop returning a unique_ptr<ResourceRequest>
+ https://bugs.webkit.org/show_bug.cgi?id=158046
+
+ Reviewed by Darin Adler.
+
+ Update constructRevalidationRequest() to stop returning a unique_ptr<ResourceRequest>
+ and to return a ResourceRequest instead. There is no reason for it to return a
+ pointer.
+
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
+ (WebKit::NetworkCache::constructRevalidationRequest):
+ (WebKit::NetworkCache::SpeculativeLoadManager::PreloadedEntry::PreloadedEntry):
+ (WebKit::NetworkCache::SpeculativeLoadManager::PreloadedEntry::revalidationRequest):
+ (WebKit::NetworkCache::SpeculativeLoadManager::addPreloadedEntry):
+ (WebKit::NetworkCache::SpeculativeLoadManager::revalidateEntry):
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h:
+
</ins><span class="cx"> 2016-05-25 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Elements with backdrop-filter cannot be clipped with clip-path or mask
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (201375 => 201376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2016-05-25 10:58:30 UTC (rev 201375)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2016-05-25 10:59:06 UTC (rev 201376)
</span><span class="lines">@@ -84,25 +84,25 @@
</span><span class="cx"> return Key(resourceKey.partition(), subresourcesType(), resourceKey.range(), resourceKey.identifier());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline std::unique_ptr<ResourceRequest> constructRevalidationRequest(const Entry& entry, const SubresourceInfo& subResourceInfo)
</del><ins>+static inline ResourceRequest constructRevalidationRequest(const Entry& entry, const SubresourceInfo& subResourceInfo)
</ins><span class="cx"> {
</span><del>- auto revalidationRequest = std::make_unique<ResourceRequest>(entry.key().identifier());
- revalidationRequest->setHTTPHeaderFields(subResourceInfo.requestHeaders);
- revalidationRequest->setFirstPartyForCookies(subResourceInfo.firstPartyForCookies);
</del><ins>+ ResourceRequest revalidationRequest(entry.key().identifier());
+ revalidationRequest.setHTTPHeaderFields(subResourceInfo.requestHeaders);
+ revalidationRequest.setFirstPartyForCookies(subResourceInfo.firstPartyForCookies);
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> if (entry.key().hasPartition())
</span><del>- revalidationRequest->setCachePartition(entry.key().partition());
</del><ins>+ revalidationRequest.setCachePartition(entry.key().partition());
</ins><span class="cx"> #endif
</span><span class="cx"> ASSERT_WITH_MESSAGE(entry.key().range().isEmpty(), "range is not supported");
</span><span class="cx">
</span><del>- revalidationRequest->makeUnconditional();
</del><ins>+ revalidationRequest.makeUnconditional();
</ins><span class="cx"> String eTag = entry.response().httpHeaderField(HTTPHeaderName::ETag);
</span><span class="cx"> if (!eTag.isEmpty())
</span><del>- revalidationRequest->setHTTPHeaderField(HTTPHeaderName::IfNoneMatch, eTag);
</del><ins>+ revalidationRequest.setHTTPHeaderField(HTTPHeaderName::IfNoneMatch, eTag);
</ins><span class="cx">
</span><span class="cx"> String lastModified = entry.response().httpHeaderField(HTTPHeaderName::LastModified);
</span><span class="cx"> if (!lastModified.isEmpty())
</span><del>- revalidationRequest->setHTTPHeaderField(HTTPHeaderName::IfModifiedSince, lastModified);
</del><ins>+ revalidationRequest.setHTTPHeaderField(HTTPHeaderName::IfModifiedSince, lastModified);
</ins><span class="cx">
</span><span class="cx"> return revalidationRequest;
</span><span class="cx"> }
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> class SpeculativeLoadManager::PreloadedEntry : private ExpiringEntry {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- PreloadedEntry(std::unique_ptr<Entry> entry, std::unique_ptr<ResourceRequest> speculativeValidationRequest, std::function<void()>&& lifetimeReachedHandler)
</del><ins>+ PreloadedEntry(std::unique_ptr<Entry> entry, Optional<ResourceRequest>&& speculativeValidationRequest, std::function<void()>&& lifetimeReachedHandler)
</ins><span class="cx"> : ExpiringEntry(WTFMove(lifetimeReachedHandler))
</span><span class="cx"> , m_entry(WTFMove(entry))
</span><span class="cx"> , m_speculativeValidationRequest(WTFMove(speculativeValidationRequest))
</span><span class="lines">@@ -145,12 +145,12 @@
</span><span class="cx"> return WTFMove(m_entry);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ResourceRequest* revalidationRequest() const { return m_speculativeValidationRequest.get(); }
</del><ins>+ const Optional<ResourceRequest>& revalidationRequest() const { return m_speculativeValidationRequest; }
</ins><span class="cx"> bool wasRevalidated() const { return !!m_speculativeValidationRequest; }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> std::unique_ptr<Entry> m_entry;
</span><del>- std::unique_ptr<ResourceRequest> m_speculativeValidationRequest;
</del><ins>+ Optional<ResourceRequest> m_speculativeValidationRequest;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class SpeculativeLoadManager::PendingFrameLoad : public RefCounted<PendingFrameLoad> {
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx"> pendingFrameLoad->registerSubresourceLoad(request, resourceKey);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SpeculativeLoadManager::addPreloadedEntry(std::unique_ptr<Entry> entry, const GlobalFrameID& frameID, std::unique_ptr<ResourceRequest> revalidationRequest)
</del><ins>+void SpeculativeLoadManager::addPreloadedEntry(std::unique_ptr<Entry> entry, const GlobalFrameID& frameID, Optional<ResourceRequest>&& revalidationRequest)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(entry);
</span><span class="cx"> ASSERT(!entry->needsValidation());
</span><span class="lines">@@ -463,15 +463,14 @@
</span><span class="cx"> if (!key.range().isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ResourceRequest* revalidationRequestPtr = constructRevalidationRequest(*entry, subresourceInfo).release();
</del><ins>+ ResourceRequest revalidationRequest = constructRevalidationRequest(*entry, subresourceInfo);
</ins><span class="cx">
</span><span class="cx"> LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) Speculatively revalidating '%s':", key.identifier().utf8().data());
</span><span class="cx">
</span><del>- auto revalidator = std::make_unique<SpeculativeLoad>(frameID, *revalidationRequestPtr, WTFMove(entry), [this, key, revalidationRequestPtr, frameID](std::unique_ptr<Entry> revalidatedEntry) {
</del><ins>+ auto revalidator = std::make_unique<SpeculativeLoad>(frameID, revalidationRequest, WTFMove(entry), [this, key, revalidationRequest, frameID](std::unique_ptr<Entry> revalidatedEntry) {
</ins><span class="cx"> ASSERT(!revalidatedEntry || !revalidatedEntry->needsValidation());
</span><span class="cx"> ASSERT(!revalidatedEntry || revalidatedEntry->key() == key);
</span><span class="cx">
</span><del>- auto revalidationRequest = std::unique_ptr<ResourceRequest>(revalidationRequestPtr);
</del><span class="cx"> auto protectRevalidator = m_pendingPreloads.take(key);
</span><span class="cx"> LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) Speculative revalidation completed for '%s':", key.identifier().utf8().data());
</span><span class="cx">
</span><span class="lines">@@ -482,7 +481,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (revalidatedEntry)
</span><del>- addPreloadedEntry(WTFMove(revalidatedEntry), frameID, WTFMove(revalidationRequest));
</del><ins>+ addPreloadedEntry(WTFMove(revalidatedEntry), frameID, revalidationRequest);
</ins><span class="cx"> });
</span><span class="cx"> m_pendingPreloads.add(key, WTFMove(revalidator));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h (201375 => 201376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h 2016-05-25 10:58:30 UTC (rev 201375)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h 2016-05-25 10:59:06 UTC (rev 201376)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> private:
</span><span class="cx"> class PreloadedEntry;
</span><span class="cx">
</span><del>- void addPreloadedEntry(std::unique_ptr<Entry>, const GlobalFrameID&, std::unique_ptr<WebCore::ResourceRequest> revalidationRequest = nullptr);
</del><ins>+ void addPreloadedEntry(std::unique_ptr<Entry>, const GlobalFrameID&, Optional<WebCore::ResourceRequest>&& revalidationRequest = Nullopt);
</ins><span class="cx"> void preloadEntry(const Key&, const SubresourceInfo&, const GlobalFrameID&);
</span><span class="cx"> void retrieveEntryFromStorage(const Key&, const RetrieveCompletionHandler&);
</span><span class="cx"> void revalidateEntry(std::unique_ptr<Entry>, const SubresourceInfo&, const GlobalFrameID&);
</span></span></pre>
</div>
</div>
</body>
</html>