<!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>[197608] trunk/Source/WebCore</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/197608">197608</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-03-04 21:24:51 -0800 (Fri, 04 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Resource load statistics are not honoring private browsing
https://bugs.webkit.org/show_bug.cgi?id=155054
<rdar://problem/24987873>
Reviewed by Andy Estes.
Modify the points where we capture resource load statistics to ignore
loads made during private browsing. Do this by moving more of the logic
about whether to gather statistics into the logging functions, passing
the raw input types (frame, ResourceRequest, ResourceResponse) internally
so that we don't pay any cost until we decide we want to gather data.s
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::willSendRequest): Revise for the new API on
ResourceLoadObserver.
* loader/ResourceLoadObserver.cpp:
(WebCore::ResourceLoadObserver::logFrameNavigation): Revise signature and
check for private browsing.
(WebCore::ResourceLoadObserver::logSubresourceLoading): Ditto.
(WebCore::ResourceLoadObserver::logUserInteraction): Ditto.
* loader/ResourceLoadObserver.h:
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::willSendRequestInternal): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadObservercpp">trunk/Source/WebCore/loader/ResourceLoadObserver.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadObserverh">trunk/Source/WebCore/loader/ResourceLoadObserver.h</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoadercpp">trunk/Source/WebCore/loader/SubresourceLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197607 => 197608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-05 03:42:06 UTC (rev 197607)
+++ trunk/Source/WebCore/ChangeLog 2016-03-05 05:24:51 UTC (rev 197608)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-03-04 Brent Fulgham <bfulgham@apple.com>
+
+ Resource load statistics are not honoring private browsing
+ https://bugs.webkit.org/show_bug.cgi?id=155054
+ <rdar://problem/24987873>
+
+ Reviewed by Andy Estes.
+
+ Modify the points where we capture resource load statistics to ignore
+ loads made during private browsing. Do this by moving more of the logic
+ about whether to gather statistics into the logging functions, passing
+ the raw input types (frame, ResourceRequest, ResourceResponse) internally
+ so that we don't pay any cost until we decide we want to gather data.s
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::willSendRequest): Revise for the new API on
+ ResourceLoadObserver.
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::logFrameNavigation): Revise signature and
+ check for private browsing.
+ (WebCore::ResourceLoadObserver::logSubresourceLoading): Ditto.
+ (WebCore::ResourceLoadObserver::logUserInteraction): Ditto.
+ * loader/ResourceLoadObserver.h:
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::willSendRequestInternal): Ditto.
+
</ins><span class="cx"> 2016-03-04 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix file mime-types when using NetworkSession
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (197607 => 197608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-03-05 03:42:06 UTC (rev 197607)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2016-03-05 05:24:51 UTC (rev 197608)
</span><span class="lines">@@ -532,8 +532,7 @@
</span><span class="cx"> ASSERT(m_frame->document());
</span><span class="cx"> ASSERT(topFrame.document());
</span><span class="cx">
</span><del>- if (Settings::resourceLoadStatisticsEnabled())
- ResourceLoadObserver::sharedObserver().logFrameNavigation(!redirectResponse.isNull(), m_frame->document()->url(), newRequest.url(), m_frame->isMainFrame(), topFrame.document()->url());
</del><ins>+ ResourceLoadObserver::sharedObserver().logFrameNavigation(*m_frame, topFrame, newRequest, redirectResponse);
</ins><span class="cx">
</span><span class="cx"> // Update cookie policy base URL as URL changes, except for subframes, which use the
</span><span class="cx"> // URL of the main frame which doesn't change when we redirect.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadObservercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadObserver.cpp (197607 => 197608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadObserver.cpp 2016-03-05 03:42:06 UTC (rev 197607)
+++ trunk/Source/WebCore/loader/ResourceLoadObserver.cpp 2016-03-05 05:24:51 UTC (rev 197608)
</span><span class="lines">@@ -27,11 +27,16 @@
</span><span class="cx"> #include "ResourceLoadObserver.h"
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "Frame.h"
</ins><span class="cx"> #include "Logging.h"
</span><ins>+#include "MainFrame.h"
</ins><span class="cx"> #include "NetworkStorageSession.h"
</span><ins>+#include "Page.h"
</ins><span class="cx"> #include "PlatformStrategies.h"
</span><span class="cx"> #include "ResourceLoadStatistics.h"
</span><span class="cx"> #include "ResourceLoadStatisticsStore.h"
</span><ins>+#include "ResourceRequest.h"
+#include "ResourceResponse.h"
</ins><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="lines">@@ -52,11 +57,25 @@
</span><span class="cx"> m_store = WTFMove(store);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoadObserver::logFrameNavigation(bool isRedirect, const URL& sourceURL, const URL& targetURL, bool isMainFrame, const URL& mainFrameURL)
</del><ins>+void ResourceLoadObserver::logFrameNavigation(const Frame& frame, const Frame& topFrame, const ResourceRequest& newRequest, const ResourceResponse& redirectResponse)
</ins><span class="cx"> {
</span><span class="cx"> if (!Settings::resourceLoadStatisticsEnabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ ASSERT(frame.document());
+ ASSERT(topFrame.document());
+ ASSERT(topFrame.page());
+
+ bool needPrivacy = topFrame.page() ? topFrame.page()->usesEphemeralSession() : false;
+ if (needPrivacy)
+ return;
+
+ bool isRedirect = !redirectResponse.isNull();
+ bool isMainFrame = frame.isMainFrame();
+ const URL& sourceURL = frame.document()->url();
+ const URL& targetURL = newRequest.url();
+ const URL& mainFrameURL = topFrame.document()->url();
+
</ins><span class="cx"> if (!targetURL.isValid() || !mainFrameURL.isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -124,11 +143,20 @@
</span><span class="cx"> m_store->fireDataModificationHandler();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoadObserver::logSubresourceLoading(bool isRedirect, const URL& sourceURL, const URL& targetURL, const URL& mainFrameURL)
</del><ins>+void ResourceLoadObserver::logSubresourceLoading(const Frame* frame, const ResourceRequest& newRequest, const ResourceResponse& redirectResponse)
</ins><span class="cx"> {
</span><span class="cx"> if (!Settings::resourceLoadStatisticsEnabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ bool needPrivacy = (frame && frame->page()) ? frame->page()->usesEphemeralSession() : false;
+ if (needPrivacy)
+ return;
+
+ bool isRedirect = !redirectResponse.isNull();
+ const URL& sourceURL = redirectResponse.url();
+ const URL& targetURL = newRequest.url();
+ const URL& mainFrameURL = frame ? frame->mainFrame().document()->url() : URL();
+
</ins><span class="cx"> auto targetHost = targetURL.host();
</span><span class="cx"> auto mainFrameHost = mainFrameURL.host();
</span><span class="cx">
</span><span class="lines">@@ -180,6 +208,10 @@
</span><span class="cx"> if (!Settings::resourceLoadStatisticsEnabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ bool needPrivacy = document.page() ? document.page()->usesEphemeralSession() : false;
+ if (needPrivacy)
+ return;
+
</ins><span class="cx"> auto& statistics = m_store->resourceStatisticsForPrimaryDomain(primaryDomain(document.url()));
</span><span class="cx"> statistics.hadUserInteraction = true;
</span><span class="cx"> m_store->fireDataModificationHandler();
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadObserverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadObserver.h (197607 => 197608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadObserver.h 2016-03-05 03:42:06 UTC (rev 197607)
+++ trunk/Source/WebCore/loader/ResourceLoadObserver.h 2016-03-05 05:24:51 UTC (rev 197608)
</span><span class="lines">@@ -33,6 +33,9 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Document;
</span><ins>+class Frame;
+class ResourceRequest;
+class ResourceResponse;
</ins><span class="cx"> class URL;
</span><span class="cx">
</span><span class="cx"> struct ResourceLoadStatistics;
</span><span class="lines">@@ -42,10 +45,11 @@
</span><span class="cx"> public:
</span><span class="cx"> WEBCORE_EXPORT static ResourceLoadObserver& sharedObserver();
</span><span class="cx">
</span><del>- void logFrameNavigation(bool isRedirect, const URL& sourceURL, const URL& targetURL, bool isMainFrame, const URL& mainFrameURL);
- void logSubresourceLoading(bool isRedirect, const URL& sourceURL, const URL& targetURL, const URL& mainFrameURL);
</del><ins>+ void logFrameNavigation(const Frame& frame, const Frame& topFrame, const ResourceRequest& newRequest, const ResourceResponse& redirectResponse);
+ void logSubresourceLoading(const Frame*, const ResourceRequest& newRequest, const ResourceResponse& redirectResponse);
+
</ins><span class="cx"> void logUserInteraction(const Document&);
</span><del>-
</del><ins>+
</ins><span class="cx"> WEBCORE_EXPORT void setStatisticsStore(Ref<ResourceLoadStatisticsStore>&&);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String statisticsForOrigin(const String&);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (197607 => 197608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-03-05 03:42:06 UTC (rev 197607)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-03-05 05:24:51 UTC (rev 197608)
</span><span class="lines">@@ -191,8 +191,7 @@
</span><span class="cx"> if (newRequest.isNull())
</span><span class="cx"> cancel();
</span><span class="cx">
</span><del>- if (Settings::resourceLoadStatisticsEnabled())
- ResourceLoadObserver::sharedObserver().logSubresourceLoading(!redirectResponse.isNull(), redirectResponse.url(), newRequest.url(), m_frame ? m_frame->mainFrame().document()->url() : URL());
</del><ins>+ ResourceLoadObserver::sharedObserver().logSubresourceLoading(m_frame.get(), newRequest, redirectResponse);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SubresourceLoader::didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
</span></span></pre>
</div>
</div>
</body>
</html>