<!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>[192258] 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/192258">192258</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-11-10 11:20:33 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2][NetworkCache] Rename SpeculativeLoader to SpeculativeLoadManager
https://bugs.webkit.org/show_bug.cgi?id=151110
Reviewed by Alex Christensen.
Rename SpeculativeLoader to SpeculativeLoadManager for clarity, as it
manages all speculative loads.
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::initialize):
(WebKit::NetworkCache::Cache::retrieve):
* NetworkProcess/cache/NetworkCache.h:
* NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp: Renamed from Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoader.cpp.
(WebKit::NetworkCache::subresourcesType):
(WebKit::NetworkCache::makeSubresourcesKey):
(WebKit::NetworkCache::SpeculativeLoadManager::PendingFrameLoad::PendingFrameLoad):
(WebKit::NetworkCache::SpeculativeLoadManager::PendingFrameLoad::registerSubresource):
(WebKit::NetworkCache::SpeculativeLoadManager::PendingFrameLoad::encodeAsSubresourcesRecord):
(WebKit::NetworkCache::SpeculativeLoadManager::PendingFrameLoad::markAsCompleted):
(WebKit::NetworkCache::SpeculativeLoadManager::SpeculativeLoadManager):
(WebKit::NetworkCache::SpeculativeLoadManager::~SpeculativeLoadManager):
(WebKit::NetworkCache::SpeculativeLoadManager::registerLoad):
* NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h: Renamed from Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoader.h.
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<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>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadercpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoaderh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoader.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (192257 => 192258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-11-10 19:14:49 UTC (rev 192257)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-11-10 19:20:33 UTC (rev 192258)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> NetworkProcess/cache/NetworkCacheEntry.cpp
</span><span class="cx"> NetworkProcess/cache/NetworkCacheFileSystem.cpp
</span><span class="cx"> NetworkProcess/cache/NetworkCacheKey.cpp
</span><del>- NetworkProcess/cache/NetworkCacheSpeculativeLoader.cpp
</del><ins>+ NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp
</ins><span class="cx"> NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp
</span><span class="cx"> NetworkProcess/cache/NetworkCacheStatistics.cpp
</span><span class="cx"> NetworkProcess/cache/NetworkCacheStorage.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192257 => 192258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-10 19:14:49 UTC (rev 192257)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-10 19:20:33 UTC (rev 192258)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-11-10 Chris Dumez <cdumez@apple.com>
+
+ [WK2][NetworkCache] Rename SpeculativeLoader to SpeculativeLoadManager
+ https://bugs.webkit.org/show_bug.cgi?id=151110
+
+ Reviewed by Alex Christensen.
+
+ Rename SpeculativeLoader to SpeculativeLoadManager for clarity, as it
+ manages all speculative loads.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::initialize):
+ (WebKit::NetworkCache::Cache::retrieve):
+ * NetworkProcess/cache/NetworkCache.h:
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp: Renamed from Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoader.cpp.
+ (WebKit::NetworkCache::subresourcesType):
+ (WebKit::NetworkCache::makeSubresourcesKey):
+ (WebKit::NetworkCache::SpeculativeLoadManager::PendingFrameLoad::PendingFrameLoad):
+ (WebKit::NetworkCache::SpeculativeLoadManager::PendingFrameLoad::registerSubresource):
+ (WebKit::NetworkCache::SpeculativeLoadManager::PendingFrameLoad::encodeAsSubresourcesRecord):
+ (WebKit::NetworkCache::SpeculativeLoadManager::PendingFrameLoad::markAsCompleted):
+ (WebKit::NetworkCache::SpeculativeLoadManager::SpeculativeLoadManager):
+ (WebKit::NetworkCache::SpeculativeLoadManager::~SpeculativeLoadManager):
+ (WebKit::NetworkCache::SpeculativeLoadManager::registerLoad):
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h: Renamed from Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoader.h.
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-11-10 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Add WKWebViewConfiguration SPI for a variety of different ex-preferences
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (192257 => 192258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-11-10 19:14:49 UTC (rev 192257)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-11-10 19:20:33 UTC (rev 192258)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx">
</span><span class="cx"> #include "Logging.h"
</span><del>-#include "NetworkCacheSpeculativeLoader.h"
</del><ins>+#include "NetworkCacheSpeculativeLoadManager.h"
</ins><span class="cx"> #include "NetworkCacheStatistics.h"
</span><span class="cx"> #include "NetworkCacheStorage.h"
</span><span class="cx"> #include <WebCore/CacheValidation.h>
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
</span><span class="cx"> if (parameters.enableNetworkCacheSpeculativeRevalidation)
</span><del>- m_speculativeLoader = std::make_unique<SpeculativeLoader>(*m_storage);
</del><ins>+ m_speculativeLoadManager = std::make_unique<SpeculativeLoadManager>(*m_storage);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (parameters.enableEfficacyLogging)
</span><span class="lines">@@ -356,8 +356,8 @@
</span><span class="cx"> Key storageKey = makeCacheKey(originalRequest);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
</span><del>- if (m_speculativeLoader)
- m_speculativeLoader->registerLoad(webPageID, webFrameID, originalRequest, storageKey);
</del><ins>+ if (m_speculativeLoadManager)
+ m_speculativeLoadManager->registerLoad(webPageID, webFrameID, originalRequest, storageKey);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(webFrameID);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (192257 => 192258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-11-10 19:14:49 UTC (rev 192257)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-11-10 19:20:33 UTC (rev 192258)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> namespace NetworkCache {
</span><span class="cx">
</span><span class="cx"> class Cache;
</span><del>-class SpeculativeLoader;
</del><ins>+class SpeculativeLoadManager;
</ins><span class="cx"> class Statistics;
</span><span class="cx">
</span><span class="cx"> Cache& singleton();
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Storage> m_storage;
</span><span class="cx"> #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
</span><del>- std::unique_ptr<SpeculativeLoader> m_speculativeLoader;
</del><ins>+ std::unique_ptr<SpeculativeLoadManager> m_speculativeLoadManager;
</ins><span class="cx"> #endif
</span><span class="cx"> std::unique_ptr<Statistics> m_statistics;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercppfromrev192257trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadercpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (from rev 192257, trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoader.cpp) (0 => 192258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2015-11-10 19:20:33 UTC (rev 192258)
</span><span class="lines">@@ -0,0 +1,145 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+#include "NetworkCacheSpeculativeLoadManager.h"
+
+#include "Logging.h"
+#include "NetworkCacheSubresourcesEntry.h"
+#include <WebCore/HysteresisActivity.h>
+#include <wtf/NeverDestroyed.h>
+#include <wtf/RunLoop.h>
+
+namespace WebKit {
+
+namespace NetworkCache {
+
+using namespace WebCore;
+
+static const AtomicString& subresourcesType()
+{
+ ASSERT(RunLoop::isMain());
+ static NeverDestroyed<const AtomicString> resource("subresources", AtomicString::ConstructFromLiteral);
+ return resource;
+}
+
+static inline Key makeSubresourcesKey(const Key& resourceKey)
+{
+ return Key(resourceKey.partition(), subresourcesType(), resourceKey.range(), resourceKey.identifier());
+}
+
+class SpeculativeLoadManager::PendingFrameLoad {
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ PendingFrameLoad(const Key& mainResourceKey, std::function<void()> completionHandler)
+ : m_mainResourceKey(mainResourceKey)
+ , m_completionHandler(completionHandler)
+ , m_loadHysteresisActivity([this](HysteresisState state) { if (state == HysteresisState::Stopped) m_completionHandler(); })
+ { }
+
+ void registerSubresource(const Key& subresourceKey)
+ {
+ ASSERT(RunLoop::isMain());
+ m_subresourceKeys.add(subresourceKey);
+ m_loadHysteresisActivity.impulse();
+ }
+
+ Optional<Storage::Record> encodeAsSubresourcesRecord()
+ {
+ ASSERT(RunLoop::isMain());
+ if (m_subresourceKeys.isEmpty())
+ return { };
+
+ auto subresourcesStorageKey = makeSubresourcesKey(m_mainResourceKey);
+ Vector<Key> subresourceKeys;
+ copyToVector(m_subresourceKeys, subresourceKeys);
+
+#if !LOG_DISABLED
+ LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) Saving to disk list of subresources for '%s':", m_mainResourceKey.identifier().utf8().data());
+ for (auto& subresourceKey : subresourceKeys)
+ LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) * Subresource: '%s'.", subresourceKey.identifier().utf8().data());
+#endif
+
+ return SubresourcesEntry(subresourcesStorageKey, WTF::move(subresourceKeys)).encodeAsStorageRecord();
+ }
+
+ void markAsCompleted()
+ {
+ ASSERT(RunLoop::isMain());
+ m_completionHandler();
+ }
+
+private:
+ Key m_mainResourceKey;
+ HashSet<Key> m_subresourceKeys;
+ std::function<void()> m_completionHandler;
+ HysteresisActivity m_loadHysteresisActivity;
+};
+
+SpeculativeLoadManager::SpeculativeLoadManager(Storage& storage)
+ : m_storage(storage)
+{
+}
+
+SpeculativeLoadManager::~SpeculativeLoadManager()
+{
+}
+
+void SpeculativeLoadManager::registerLoad(uint64_t webPageID, uint64_t webFrameID, const ResourceRequest& request, const Key& resourceKey)
+{
+ ASSERT(RunLoop::isMain());
+
+ if (!request.url().protocolIsInHTTPFamily() || request.httpMethod() != "GET")
+ return;
+
+ auto frameKey = std::make_pair(webPageID, webFrameID);
+ auto isMainResource = request.requester() == ResourceRequest::Requester::Main;
+ if (isMainResource) {
+ // Mark previous load in this frame as completed if necessary.
+ if (auto* pendingFrameLoad = m_pendingFrameLoads.get(frameKey))
+ pendingFrameLoad->markAsCompleted();
+
+ // Start tracking loads in this frame.
+ m_pendingFrameLoads.add(frameKey, std::make_unique<PendingFrameLoad>(resourceKey, [this, frameKey]() {
+ auto frameLoad = m_pendingFrameLoads.take(frameKey);
+ auto optionalRecord = frameLoad->encodeAsSubresourcesRecord();
+ if (!optionalRecord)
+ return;
+ m_storage.store(optionalRecord.value(), [](const Data&) { });
+ }));
+ return;
+ }
+
+ if (auto* pendingFrameLoad = m_pendingFrameLoads.get(frameKey))
+ pendingFrameLoad->registerSubresource(resourceKey);
+}
+
+} // namespace NetworkCache
+
+} // namespace WebKit
+
+#endif // ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagerhfromrev192257trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoaderh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h (from rev 192257, trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoader.h) (0 => 192258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h 2015-11-10 19:20:33 UTC (rev 192258)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef NetworkCacheSpeculativeLoadManager_h
+#define NetworkCacheSpeculativeLoadManager_h
+
+#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+
+#include "NetworkCacheStorage.h"
+#include <WebCore/ResourceRequest.h>
+#include <wtf/HashMap.h>
+
+namespace WebKit {
+
+namespace NetworkCache {
+
+class SpeculativeLoadManager {
+public:
+ explicit SpeculativeLoadManager(Storage&);
+ ~SpeculativeLoadManager();
+
+ void registerLoad(uint64_t webPageID, uint64_t webFrameID, const WebCore::ResourceRequest&, const Key& resourceKey);
+
+private:
+ Storage& m_storage;
+
+ class PendingFrameLoad;
+ using GlobalFrameID = std::pair<uint64_t /*webPageID*/, uint64_t /*webFrameID*/>;
+ HashMap<GlobalFrameID, std::unique_ptr<PendingFrameLoad>> m_pendingFrameLoads;
+};
+
+} // namespace NetworkCache
+
+} // namespace WebKit
+
+#endif // ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+
+#endif // NetworkCacheSpeculativeLoadManager_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoader.cpp (192257 => 192258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoader.cpp 2015-11-10 19:14:49 UTC (rev 192257)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoader.cpp 2015-11-10 19:20:33 UTC (rev 192258)
</span><span class="lines">@@ -1,145 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
-#include "NetworkCacheSpeculativeLoader.h"
-
-#include "Logging.h"
-#include "NetworkCacheSubresourcesEntry.h"
-#include <WebCore/HysteresisActivity.h>
-#include <wtf/NeverDestroyed.h>
-#include <wtf/RunLoop.h>
-
-namespace WebKit {
-
-namespace NetworkCache {
-
-using namespace WebCore;
-
-static const AtomicString& subresourcesType()
-{
- ASSERT(RunLoop::isMain());
- static NeverDestroyed<const AtomicString> resource("subresources", AtomicString::ConstructFromLiteral);
- return resource;
-}
-
-static inline Key makeSubresourcesKey(const Key& resourceKey)
-{
- return Key(resourceKey.partition(), subresourcesType(), resourceKey.range(), resourceKey.identifier());
-}
-
-class SpeculativeLoader::PendingFrameLoad {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- PendingFrameLoad(const Key& mainResourceKey, std::function<void()> completionHandler)
- : m_mainResourceKey(mainResourceKey)
- , m_completionHandler(completionHandler)
- , m_loadHysteresisActivity([this](HysteresisState state) { if (state == HysteresisState::Stopped) m_completionHandler(); })
- { }
-
- void registerSubresource(const Key& subresourceKey)
- {
- ASSERT(RunLoop::isMain());
- m_subresourceKeys.add(subresourceKey);
- m_loadHysteresisActivity.impulse();
- }
-
- Optional<Storage::Record> encodeAsSubresourcesRecord()
- {
- ASSERT(RunLoop::isMain());
- if (m_subresourceKeys.isEmpty())
- return { };
-
- auto subresourcesStorageKey = makeSubresourcesKey(m_mainResourceKey);
- Vector<Key> subresourceKeys;
- copyToVector(m_subresourceKeys, subresourceKeys);
-
-#if !LOG_DISABLED
- LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) Saving to disk list of subresources for '%s':", m_mainResourceKey.identifier().utf8().data());
- for (auto& subresourceKey : subresourceKeys)
- LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) * Subresource: '%s'.", subresourceKey.identifier().utf8().data());
-#endif
-
- return SubresourcesEntry(subresourcesStorageKey, WTF::move(subresourceKeys)).encodeAsStorageRecord();
- }
-
- void markAsCompleted()
- {
- ASSERT(RunLoop::isMain());
- m_completionHandler();
- }
-
-private:
- Key m_mainResourceKey;
- HashSet<Key> m_subresourceKeys;
- std::function<void()> m_completionHandler;
- HysteresisActivity m_loadHysteresisActivity;
-};
-
-SpeculativeLoader::SpeculativeLoader(Storage& storage)
- : m_storage(storage)
-{
-}
-
-SpeculativeLoader::~SpeculativeLoader()
-{
-}
-
-void SpeculativeLoader::registerLoad(uint64_t webPageID, uint64_t webFrameID, const ResourceRequest& request, const Key& resourceKey)
-{
- ASSERT(RunLoop::isMain());
-
- if (!request.url().protocolIsInHTTPFamily() || request.httpMethod() != "GET")
- return;
-
- auto frameKey = std::make_pair(webPageID, webFrameID);
- auto isMainResource = request.requester() == ResourceRequest::Requester::Main;
- if (isMainResource) {
- // Mark previous load in this frame as completed if necessary.
- if (auto* pendingFrameLoad = m_pendingFrameLoads.get(frameKey))
- pendingFrameLoad->markAsCompleted();
-
- // Start tracking loads in this frame.
- m_pendingFrameLoads.add(frameKey, std::make_unique<PendingFrameLoad>(resourceKey, [this, frameKey]() {
- auto frameLoad = m_pendingFrameLoads.take(frameKey);
- auto optionalRecord = frameLoad->encodeAsSubresourcesRecord();
- if (!optionalRecord)
- return;
- m_storage.store(optionalRecord.value(), [](const Data&) { });
- }));
- return;
- }
-
- if (auto* pendingFrameLoad = m_pendingFrameLoads.get(frameKey))
- pendingFrameLoad->registerSubresource(resourceKey);
-}
-
-} // namespace NetworkCache
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoaderh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoader.h (192257 => 192258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoader.h 2015-11-10 19:14:49 UTC (rev 192257)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoader.h 2015-11-10 19:20:33 UTC (rev 192258)
</span><span class="lines">@@ -1,60 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef NetworkCacheSpeculativeLoader_h
-#define NetworkCacheSpeculativeLoader_h
-
-#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
-
-#include "NetworkCacheStorage.h"
-#include <WebCore/ResourceRequest.h>
-#include <wtf/HashMap.h>
-
-namespace WebKit {
-
-namespace NetworkCache {
-
-class SpeculativeLoader {
-public:
- explicit SpeculativeLoader(Storage&);
- ~SpeculativeLoader();
-
- void registerLoad(uint64_t webPageID, uint64_t webFrameID, const WebCore::ResourceRequest&, const Key& resourceKey);
-
-private:
- Storage& m_storage;
-
- class PendingFrameLoad;
- using GlobalFrameID = std::pair<uint64_t /*webPageID*/, uint64_t /*webFrameID*/>;
- HashMap<GlobalFrameID, std::unique_ptr<PendingFrameLoad>> m_pendingFrameLoads;
-};
-
-} // namespace NetworkCache
-
-} // namespace WebKit
-
-#endif // ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
-
-#endif // NetworkCacheSpeculativeLoader_h
</del></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (192257 => 192258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-11-10 19:14:49 UTC (rev 192257)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-11-10 19:20:33 UTC (rev 192258)
</span><span class="lines">@@ -1180,8 +1180,8 @@
</span><span class="cx"> 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 83048AE51ACA45DC0082C832 /* ProcessThrottlerClient.h */; };
</span><span class="cx"> 8310428B1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 831042891BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.h */; };
</span><span class="cx"> 8310428C1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8310428A1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.cpp */; };
</span><del>- 832AE2521BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 832AE2501BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoader.h */; };
- 832AE2531BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832AE2511BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoader.cpp */; };
</del><ins>+ 832AE2521BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 832AE2501BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.h */; };
+ 832AE2531BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832AE2511BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.cpp */; };
</ins><span class="cx"> 834B250F1A831A8D00CFB150 /* NetworkCacheFileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 834B250E1A831A8D00CFB150 /* NetworkCacheFileSystem.h */; };
</span><span class="cx"> 834B25121A842C8700CFB150 /* NetworkCacheStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = 834B25101A842C8700CFB150 /* NetworkCacheStatistics.h */; };
</span><span class="cx"> 8360349F1ACB34D600626549 /* WebSQLiteDatabaseTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8360349D1ACB34D600626549 /* WebSQLiteDatabaseTracker.cpp */; };
</span><span class="lines">@@ -3420,8 +3420,8 @@
</span><span class="cx"> 83048AE51ACA45DC0082C832 /* ProcessThrottlerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessThrottlerClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 831042891BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheSubresourcesEntry.h; sourceTree = "<group>"; };
</span><span class="cx"> 8310428A1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheSubresourcesEntry.cpp; sourceTree = "<group>"; };
</span><del>- 832AE2501BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheSpeculativeLoader.h; sourceTree = "<group>"; };
- 832AE2511BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheSpeculativeLoader.cpp; sourceTree = "<group>"; };
</del><ins>+ 832AE2501BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheSpeculativeLoadManager.h; sourceTree = "<group>"; };
+ 832AE2511BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheSpeculativeLoadManager.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 834B250E1A831A8D00CFB150 /* NetworkCacheFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheFileSystem.h; sourceTree = "<group>"; };
</span><span class="cx"> 834B25101A842C8700CFB150 /* NetworkCacheStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheStatistics.h; sourceTree = "<group>"; };
</span><span class="cx"> 8360349D1ACB34D600626549 /* WebSQLiteDatabaseTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSQLiteDatabaseTracker.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -7587,8 +7587,8 @@
</span><span class="cx"> E42E060D1AA750E500B11699 /* NetworkCacheIOChannelCocoa.mm */,
</span><span class="cx"> E4436EC01A0CFDB200EAD204 /* NetworkCacheKey.cpp */,
</span><span class="cx"> E4436EC11A0CFDB200EAD204 /* NetworkCacheKey.h */,
</span><del>- 832AE2511BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoader.cpp */,
- 832AE2501BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoader.h */,
</del><ins>+ 832AE2511BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.cpp */,
+ 832AE2501BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.h */,
</ins><span class="cx"> 83BDCCB81AC5FDB6003F6441 /* NetworkCacheStatistics.cpp */,
</span><span class="cx"> 834B25101A842C8700CFB150 /* NetworkCacheStatistics.h */,
</span><span class="cx"> E4436EC31A0CFDB200EAD204 /* NetworkCacheStorage.cpp */,
</span><span class="lines">@@ -7732,7 +7732,7 @@
</span><span class="cx"> 75A8D2E1187DEC1A00C39C9E /* APISession.h in Headers */,
</span><span class="cx"> 1AFDE6621954E9B100C48FFA /* APISessionState.h in Headers */,
</span><span class="cx"> 1A4D664818A2D91A00D82E21 /* APIUIClient.h in Headers */,
</span><del>- 832AE2521BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoader.h in Headers */,
</del><ins>+ 832AE2521BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.h in Headers */,
</ins><span class="cx"> BCDB86C11200FB97007254BE /* APIURL.h in Headers */,
</span><span class="cx"> BCE2315D122C30CA00D5C35A /* APIURLRequest.h in Headers */,
</span><span class="cx"> BC90A1D2122DD55E00CC8C50 /* APIURLResponse.h in Headers */,
</span><span class="lines">@@ -9546,7 +9546,7 @@
</span><span class="cx"> 7C89D2971A6753B2003A5FDE /* APIPageConfiguration.cpp in Sources */,
</span><span class="cx"> 1A3A73CF1A48C7F1007231B3 /* APIPageGroupHandle.cpp in Sources */,
</span><span class="cx"> 1AC1336E18565D2B00F3EC05 /* APIPageHandle.cpp in Sources */,
</span><del>- 832AE2531BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoader.cpp in Sources */,
</del><ins>+ 832AE2531BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.cpp in Sources */,
</ins><span class="cx"> 7CE4D21F1A4914CA00C7F152 /* APIProcessPoolConfiguration.cpp in Sources */,
</span><span class="cx"> FED3C1DC1B447EAC00E0EB7F /* APISerializedScriptValueCocoa.mm in Sources */,
</span><span class="cx"> A182D5B41BE6BD250087A7CC /* AccessibilityIOS.mm in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>