<!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>[198055] trunk/Source</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/198055">198055</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-11 16:36:17 -0800 (Fri, 11 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move prevalent resource classifier from WebCore to WebKit.
https://bugs.webkit.org/show_bug.cgi?id=155242
<rdar://problem/24913272>
Patch by John Wilander <wilander@apple.com> on 2016-03-11
Reviewed by Andy Estes.
Source/WebCore:
No new tests since we have yet to decide how to set up tests for prevalent resources.
* loader/ResourceLoadObserver.cpp:
(WebCore::ResourceLoadObserver::logFrameNavigation):
(WebCore::ResourceLoadObserver::logSubresourceLoading):
- Removed calls to old classifier in WebCore.
* loader/ResourceLoadStatistics.cpp:
(WebCore::encodeHashCountedSet):
(WebCore::ResourceLoadStatistics::checkAndSetAsPrevalentResourceIfNecessary): Deleted.
(WebCore::ResourceLoadStatistics::hasPrevalentResourceCharacteristics): Deleted.
* loader/ResourceLoadStatistics.h:
- Deleted old classification functions.
* loader/ResourceLoadStatisticsStore.cpp:
(WebCore::ResourceLoadStatisticsStore::create):
(WebCore::ResourceLoadStatisticsStore::fireDataModificationHandler):
(WebCore::ResourceLoadStatisticsStore::hasEnoughDataForStatisticsProcessing):
- New function to allow for checks before calls to processStatistics.
(WebCore::ResourceLoadStatisticsStore::processStatistics):
- New function that receives a lamda and executes it on every entry in its statistics map.
* loader/ResourceLoadStatisticsStore.h:
Source/WebKit2:
* UIProcess/WebResourceLoadStatisticsStore.cpp:
(WebKit::WebResourceLoadStatisticsStore::create):
(WebKit::WebResourceLoadStatisticsStore::~WebResourceLoadStatisticsStore):
(WebKit::hasPrevalentResourceCharacteristics):
(WebKit::classifyPrevalentResources):
- Moved these two functions from WebCore.
(WebKit::WebResourceLoadStatisticsStore::resourceLoadStatisticsUpdated):
- Calls processStatistics with a lamda function to classify prevalent resources.
* WebKit2.xcodeproj/project.pbxproj:
- Fixed the ordering of source files.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadObservercpp">trunk/Source/WebCore/loader/ResourceLoadObserver.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadStatisticscpp">trunk/Source/WebCore/loader/ResourceLoadStatistics.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadStatisticsh">trunk/Source/WebCore/loader/ResourceLoadStatistics.h</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadStatisticsStorecpp">trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadStatisticsStoreh">trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebResourceLoadStatisticsStorecpp">trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198054 => 198055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-11 23:59:04 UTC (rev 198054)
+++ trunk/Source/WebCore/ChangeLog 2016-03-12 00:36:17 UTC (rev 198055)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-03-11 John Wilander <wilander@apple.com>
+
+ Move prevalent resource classifier from WebCore to WebKit.
+ https://bugs.webkit.org/show_bug.cgi?id=155242
+ <rdar://problem/24913272>
+
+ Reviewed by Andy Estes.
+
+ No new tests since we have yet to decide how to set up tests for prevalent resources.
+
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::logFrameNavigation):
+ (WebCore::ResourceLoadObserver::logSubresourceLoading):
+ - Removed calls to old classifier in WebCore.
+ * loader/ResourceLoadStatistics.cpp:
+ (WebCore::encodeHashCountedSet):
+ (WebCore::ResourceLoadStatistics::checkAndSetAsPrevalentResourceIfNecessary): Deleted.
+ (WebCore::ResourceLoadStatistics::hasPrevalentResourceCharacteristics): Deleted.
+ * loader/ResourceLoadStatistics.h:
+ - Deleted old classification functions.
+ * loader/ResourceLoadStatisticsStore.cpp:
+ (WebCore::ResourceLoadStatisticsStore::create):
+ (WebCore::ResourceLoadStatisticsStore::fireDataModificationHandler):
+ (WebCore::ResourceLoadStatisticsStore::hasEnoughDataForStatisticsProcessing):
+ - New function to allow for checks before calls to processStatistics.
+ (WebCore::ResourceLoadStatisticsStore::processStatistics):
+ - New function that receives a lamda and executes it on every entry in its statistics map.
+ * loader/ResourceLoadStatisticsStore.h:
+
</ins><span class="cx"> 2016-03-11 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit should not be redirected to an invalid URL
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadObservercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadObserver.cpp (198054 => 198055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadObserver.cpp 2016-03-11 23:59:04 UTC (rev 198054)
+++ trunk/Source/WebCore/loader/ResourceLoadObserver.cpp 2016-03-12 00:36:17 UTC (rev 198055)
</span><span class="lines">@@ -142,7 +142,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- targetStatistics.checkAndSetAsPrevalentResourceIfNecessary(m_store->size());
</del><span class="cx"> m_store->fireDataModificationHandler();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -205,7 +204,6 @@
</span><span class="cx"> targetStatistics.subresourceHasBeenSubresourceCountDividedByTotalNumberOfOriginsVisited = static_cast<double>(targetStatistics.subresourceHasBeenSubresourceCount) / totalVisited;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- targetStatistics.checkAndSetAsPrevalentResourceIfNecessary(m_store->size());
</del><span class="cx"> m_store->fireDataModificationHandler();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadStatistics.cpp (198054 => 198055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadStatistics.cpp 2016-03-11 23:59:04 UTC (rev 198054)
+++ trunk/Source/WebCore/loader/ResourceLoadStatistics.cpp 2016-03-12 00:36:17 UTC (rev 198055)
</span><span class="lines">@@ -32,37 +32,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static const unsigned minimumOriginsVisitedForPrevalenceClassification = 100;
-
-// Sub frame thresholds
-static const unsigned subframeUnderTopFrameOriginsThresholdAbsolute = 3;
-
-// Subresource thresholds
-static const unsigned subresourceUnderTopFrameOriginsThresholdAbsolute = 5;
-static const unsigned subresourceHasBeenRedirectedFromToUniqueDomainsThresholdAbsolute = 3;
-static const unsigned redirectedToOtherPrevalentResourceOriginsThresholdAbsolute = 2;
-
-bool ResourceLoadStatistics::checkAndSetAsPrevalentResourceIfNecessary(unsigned originsVisitedSoFar)
-{
- if (originsVisitedSoFar < minimumOriginsVisitedForPrevalenceClassification || isPrevalentResource)
- return false;
-
- if (hasPrevalentResourceCharacteristics()) {
- isPrevalentResource = true;
- return true;
- }
-
- return false;
-}
-
-bool ResourceLoadStatistics::hasPrevalentResourceCharacteristics() const
-{
- return subframeUnderTopFrameOrigins.size() > subframeUnderTopFrameOriginsThresholdAbsolute
- || subresourceUnderTopFrameOrigins.size() > subresourceUnderTopFrameOriginsThresholdAbsolute
- || subresourceUniqueRedirectsTo.size() > subresourceHasBeenRedirectedFromToUniqueDomainsThresholdAbsolute
- || redirectedToOtherPrevalentResourceOrigins.size() > redirectedToOtherPrevalentResourceOriginsThresholdAbsolute;
-}
-
</del><span class="cx"> typedef WTF::HashMap<String, unsigned, StringHash, HashTraits<String>, HashTraits<unsigned>>::KeyValuePairType ResourceLoadStatisticsValue;
</span><span class="cx">
</span><span class="cx"> static void encodeHashCountedSet(KeyedEncoder& encoder, const String& label, const HashCountedSet<String>& hashCountedSet)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadStatisticsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadStatistics.h (198054 => 198055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadStatistics.h 2016-03-11 23:59:04 UTC (rev 198054)
+++ trunk/Source/WebCore/loader/ResourceLoadStatistics.h 2016-03-12 00:36:17 UTC (rev 198055)
</span><span class="lines">@@ -42,11 +42,6 @@
</span><span class="cx">
</span><span class="cx"> ResourceLoadStatistics() = default;
</span><span class="cx">
</span><del>- bool checkAndSetAsPrevalentResourceIfNecessary(unsigned originsVisitedSoFar);
-
- bool hasPrevalentRedirection() const;
- bool hasPrevalentResourceCharacteristics() const;
-
</del><span class="cx"> void encode(KeyedEncoder&) const;
</span><span class="cx"> bool decode(KeyedDecoder&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadStatisticsStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.cpp (198054 => 198055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.cpp 2016-03-11 23:59:04 UTC (rev 198054)
+++ trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.cpp 2016-03-12 00:36:17 UTC (rev 198055)
</span><span class="lines">@@ -41,6 +41,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static const unsigned minimumOriginsLoadedForProcessing = 100;
+
</ins><span class="cx"> Ref<ResourceLoadStatisticsStore> ResourceLoadStatisticsStore::create()
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new ResourceLoadStatisticsStore());
</span><span class="lines">@@ -137,4 +139,15 @@
</span><span class="cx"> m_dataAddedHandler();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ResourceLoadStatisticsStore::hasEnoughDataForStatisticsProcessing()
+{
+ return m_resourceStatisticsMap.size() >= minimumOriginsLoadedForProcessing;
</ins><span class="cx"> }
</span><ins>+
+void ResourceLoadStatisticsStore::processStatistics(std::function<void(ResourceLoadStatistics&)>&& processFunction)
+{
+ ASSERT(hasEnoughDataForStatisticsProcessing());
+ for (auto& resourceStatistic : m_resourceStatisticsMap.values())
+ processFunction(resourceStatistic);
+}
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadStatisticsStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.h (198054 => 198055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.h 2016-03-11 23:59:04 UTC (rev 198054)
+++ trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.h 2016-03-12 00:36:17 UTC (rev 198055)
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx">
</span><span class="cx"> void fireDataModificationHandler();
</span><span class="cx">
</span><ins>+ WEBCORE_EXPORT bool hasEnoughDataForStatisticsProcessing();
+ WEBCORE_EXPORT void processStatistics(std::function<void(ResourceLoadStatistics&)>&&);
</ins><span class="cx"> private:
</span><span class="cx"> ResourceLoadStatisticsStore() = default;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198054 => 198055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-11 23:59:04 UTC (rev 198054)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-12 00:36:17 UTC (rev 198055)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-03-11 John Wilander <wilander@apple.com>
+
+ Move prevalent resource classifier from WebCore to WebKit.
+ https://bugs.webkit.org/show_bug.cgi?id=155242
+ <rdar://problem/24913272>
+
+ Reviewed by Andy Estes.
+
+ * UIProcess/WebResourceLoadStatisticsStore.cpp:
+ (WebKit::WebResourceLoadStatisticsStore::create):
+ (WebKit::WebResourceLoadStatisticsStore::~WebResourceLoadStatisticsStore):
+ (WebKit::hasPrevalentResourceCharacteristics):
+ (WebKit::classifyPrevalentResources):
+ - Moved these two functions from WebCore.
+ (WebKit::WebResourceLoadStatisticsStore::resourceLoadStatisticsUpdated):
+ - Calls processStatistics with a lamda function to classify prevalent resources.
+ * WebKit2.xcodeproj/project.pbxproj:
+ - Fixed the ordering of source files.
+
</ins><span class="cx"> 2016-03-11 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> WebKit needs a new sandbox profile addition for DataDetectors
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebResourceLoadStatisticsStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp (198054 => 198055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2016-03-11 23:59:04 UTC (rev 198054)
+++ trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2016-03-12 00:36:17 UTC (rev 198055)
</span><span class="lines">@@ -30,13 +30,21 @@
</span><span class="cx"> #include "WebProcessPool.h"
</span><span class="cx"> #include "WebResourceLoadStatisticsStoreMessages.h"
</span><span class="cx"> #include <WebCore/KeyedCoding.h>
</span><del>-#include <WebCore/ResourceLoadStatisticsStore.h>
</del><ins>+#include <WebCore/ResourceLoadStatistics.h>
</ins><span class="cx"> #include <wtf/threads/BinarySemaphore.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+// Sub frame classification thresholds
+static const unsigned subframeUnderTopFrameOriginsThreshold = 3;
+
+// Subresource classification thresholds
+static const unsigned subresourceUnderTopFrameOriginsThreshold = 5;
+static const unsigned subresourceHasBeenRedirectedFromToUniqueDomainsThreshold = 3;
+static const unsigned redirectedToOtherPrevalentResourceOriginsThreshold = 2;
+
</ins><span class="cx"> Ref<WebResourceLoadStatisticsStore> WebResourceLoadStatisticsStore::create(const String& resourceLoadStatisticsDirectory)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebResourceLoadStatisticsStore(resourceLoadStatisticsDirectory));
</span><span class="lines">@@ -53,11 +61,37 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline bool hasPrevalentResourceCharacteristics(const ResourceLoadStatistics& resourceStatistic)
+{
+ return resourceStatistic.subframeUnderTopFrameOrigins.size() > subframeUnderTopFrameOriginsThreshold
+ || resourceStatistic.subresourceUnderTopFrameOrigins.size() > subresourceUnderTopFrameOriginsThreshold
+ || resourceStatistic.subresourceUniqueRedirectsTo.size() > subresourceHasBeenRedirectedFromToUniqueDomainsThreshold
+ || resourceStatistic.redirectedToOtherPrevalentResourceOrigins.size() > redirectedToOtherPrevalentResourceOriginsThreshold;
+}
+
+static inline void classifyPrevalentResources(ResourceLoadStatistics& resourceStatistic, Vector<String>& prevalentResources, Vector<String>& prevalentResourcesWithUserInteraction)
+{
+ if (resourceStatistic.isPrevalentResource || hasPrevalentResourceCharacteristics(resourceStatistic)) {
+ resourceStatistic.isPrevalentResource = true;
+ if (resourceStatistic.hadUserInteraction)
+ prevalentResourcesWithUserInteraction.append(resourceStatistic.highLevelDomain);
+ else
+ prevalentResources.append(resourceStatistic.highLevelDomain);
+ }
+}
+
</ins><span class="cx"> void WebResourceLoadStatisticsStore::resourceLoadStatisticsUpdated(const Vector<WebCore::ResourceLoadStatistics>& origins)
</span><span class="cx"> {
</span><span class="cx"> coreStore().mergeStatistics(origins);
</span><del>- // TODO: Analyze statistics to recognize prevalent domains. <rdar://problem/24913272>
- // TODO: Notify individual WebProcesses of prevalent domains. <rdar://problem/24703099>
</del><ins>+
+ Vector<String> prevalentResources, prevalentResourcesWithUserInteraction;
+ if (coreStore().hasEnoughDataForStatisticsProcessing()) {
+ coreStore().processStatistics([this, &prevalentResources, &prevalentResourcesWithUserInteraction] (ResourceLoadStatistics& resourceStatistic) {
+ classifyPrevalentResources(resourceStatistic, prevalentResources, prevalentResourcesWithUserInteraction);
+ });
+ }
+
+ // FIXME: Notify individual WebProcesses of prevalent domains using the two vectors populated by the classifier. <rdar://problem/24703099>
</ins><span class="cx"> auto encoder = coreStore().createEncoderFromData();
</span><span class="cx">
</span><span class="cx"> writeEncoderToDisk(*encoder.get(), "full_browsing_session");
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (198054 => 198055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-03-11 23:59:04 UTC (rev 198054)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-03-12 00:36:17 UTC (rev 198055)
</span><span class="lines">@@ -5824,9 +5824,6 @@
</span><span class="cx"> 86E67A22190F411800004AB7 /* ProcessThrottler.cpp */,
</span><span class="cx"> 86E67A21190F411800004AB7 /* ProcessThrottler.h */,
</span><span class="cx"> 83048AE51ACA45DC0082C832 /* ProcessThrottlerClient.h */,
</span><del>- 7A9CD8C01C77984900D9F6C7 /* WebResourceLoadStatisticsStore.cpp */,
- 7A9CD8C11C77984900D9F6C7 /* WebResourceLoadStatisticsStore.h */,
- 7A9CD8C21C779AD600D9F6C7 /* WebResourceLoadStatisticsStore.messages.in */,
</del><span class="cx"> BC111B08112F5E3C00337BAB /* ResponsivenessTimer.cpp */,
</span><span class="cx"> 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */,
</span><span class="cx"> 51A4D5A816CAC4FF000E615E /* StatisticsRequest.cpp */,
</span><span class="lines">@@ -5923,6 +5920,9 @@
</span><span class="cx"> BC111B0D112F5E4F00337BAB /* WebProcessProxy.cpp */,
</span><span class="cx"> BC032DCF10F4389F0058C15A /* WebProcessProxy.h */,
</span><span class="cx"> BCEE7AB312817095009827DA /* WebProcessProxy.messages.in */,
</span><ins>+ 7A9CD8C01C77984900D9F6C7 /* WebResourceLoadStatisticsStore.cpp */,
+ 7A9CD8C11C77984900D9F6C7 /* WebResourceLoadStatisticsStore.h */,
+ 7A9CD8C21C779AD600D9F6C7 /* WebResourceLoadStatisticsStore.messages.in */,
</ins><span class="cx"> );
</span><span class="cx"> path = UIProcess;
</span><span class="cx"> sourceTree = "<group>";
</span></span></pre>
</div>
</div>
</body>
</html>