<!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>[179210] branches/safari-600.1.4.15-branch/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/179210">179210</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-01-27 13:27:09 -0800 (Tue, 27 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/177499">r177499</a>. rdar://problem/19445880</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreloaderSubresourceLoadercpp">branches/safari-600.1.4.15-branch/Source/WebCore/loader/SubresourceLoader.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreloadercacheCachedImagecpp">branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedImage.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreloadercacheCachedImageh">branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedImage.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreloadercacheCachedResourcecpp">branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreloadercacheCachedResourceh">branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreloadercacheCachedResourceLoadercpp">branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformFeatureCounterKeysh">branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179209 => 179210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-27 21:19:18 UTC (rev 179209)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-27 21:27:09 UTC (rev 179210)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2015-01-27 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r177499
+
+ 2014-12-18 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Log why cached resources are being revalidated using FeatureCounter API
+ https://bugs.webkit.org/show_bug.cgi?id=139759
+ <rdar://problem/19288177>
+
+ Reviewed by Antti Koivisto.
+
+ Log why cached resources are being revalidated using FeatureCounter API.
+ Also log if revalidation is successful or not.
+
+ No new tests, no behavior change.
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::willSendRequest):
+ (WebCore::SubresourceLoader::didReceiveResponse):
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::mustRevalidateDueToCacheHeaders):
+ * loader/cache/CachedImage.h:
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::failBeforeStarting):
+ (WebCore::CachedResource::mustRevalidateDueToCacheHeaders):
+ * loader/cache/CachedResource.h:
+ (WebCore::CachedResource::loader):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::determineRevalidationPolicy):
+ * platform/FeatureCounterKeys.h:
+
+2015-01-27 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r177455
</span><span class="cx">
</span><span class="cx"> 2014-12-17 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/loader/SubresourceLoader.cpp (179209 => 179210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/loader/SubresourceLoader.cpp 2015-01-27 21:19:18 UTC (rev 179209)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/loader/SubresourceLoader.cpp 2015-01-27 21:27:09 UTC (rev 179210)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "DocumentLoader.h"
</span><ins>+#include "FeatureCounter.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="lines">@@ -158,6 +159,7 @@
</span><span class="cx"> if (newRequest.isConditional() && m_resource->resourceToRevalidate() && newRequest.url() != m_resource->resourceToRevalidate()->response().url()) {
</span><span class="cx"> newRequest.makeUnconditional();
</span><span class="cx"> memoryCache()->revalidationFailed(m_resource);
</span><ins>+ FEATURE_COUNTER_INCREMENT_KEY(m_frame ? m_frame->page() : nullptr, FeatureCounterCachedResourceRevalidationFailureKey);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_documentLoader->cachedResourceLoader().canRequest(m_resource->type(), newRequest.url(), options())) {
</span><span class="lines">@@ -201,12 +203,14 @@
</span><span class="cx"> // Existing resource is ok, just use it updating the expiration time.
</span><span class="cx"> m_resource->setResponse(response);
</span><span class="cx"> memoryCache()->revalidationSucceeded(m_resource, response);
</span><ins>+ FEATURE_COUNTER_INCREMENT_KEY(m_frame ? m_frame->page() : nullptr, FeatureCounterCachedResourceRevalidationSuccessKey);
</ins><span class="cx"> if (!reachedTerminalState())
</span><span class="cx"> ResourceLoader::didReceiveResponse(response);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> // Did not get 304 response, continue as a regular resource load.
</span><span class="cx"> memoryCache()->revalidationFailed(m_resource);
</span><ins>+ FEATURE_COUNTER_INCREMENT_KEY(m_frame ? m_frame->page() : nullptr, FeatureCounterCachedResourceRevalidationFailureKey);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_resource->responseReceived(response);
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreloadercacheCachedImagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedImage.cpp (179209 => 179210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedImage.cpp 2015-01-27 21:19:18 UTC (rev 179209)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedImage.cpp 2015-01-27 21:27:09 UTC (rev 179210)
</span><span class="lines">@@ -568,7 +568,7 @@
</span><span class="cx"> return !securityOrigin->taintsCanvas(response().url());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CachedImage::mustRevalidateDueToCacheHeaders(CachePolicy policy) const
</del><ins>+bool CachedImage::mustRevalidateDueToCacheHeaders(const CachedResourceLoader& cachedResourceLoader, CachePolicy policy) const
</ins><span class="cx"> {
</span><span class="cx"> if (UNLIKELY(isManuallyCached())) {
</span><span class="cx"> // Do not revalidate manually cached images. This mechanism is used as a
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx"> // incumbent on the client to only use valid resources.
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- return CachedResource::mustRevalidateDueToCacheHeaders(policy);
</del><ins>+ return CachedResource::mustRevalidateDueToCacheHeaders(cachedResourceLoader, policy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreloadercacheCachedImageh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedImage.h (179209 => 179210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedImage.h 2015-01-27 21:19:18 UTC (rev 179209)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedImage.h 2015-01-27 21:27:09 UTC (rev 179210)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
</span><span class="cx">
</span><span class="cx"> bool isManuallyCached() const { return m_isManuallyCached; }
</span><del>- virtual bool mustRevalidateDueToCacheHeaders(CachePolicy) const;
</del><ins>+ virtual bool mustRevalidateDueToCacheHeaders(const CachedResourceLoader&, CachePolicy) const;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> virtual bool canUseDiskImageCache() const override;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.cpp (179209 => 179210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.cpp 2015-01-27 21:19:18 UTC (rev 179209)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.cpp 2015-01-27 21:27:09 UTC (rev 179210)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "CrossOriginAccessControl.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "DocumentLoader.h"
</span><ins>+#include "FeatureCounter.h"
</ins><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "HTTPHeaderNames.h"
</span><span class="lines">@@ -761,21 +762,29 @@
</span><span class="cx"> return m_response.hasCacheValidatorFields();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CachedResource::mustRevalidateDueToCacheHeaders(CachePolicy cachePolicy) const
</del><ins>+bool CachedResource::mustRevalidateDueToCacheHeaders(const CachedResourceLoader& cachedResourceLoader, CachePolicy cachePolicy) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(cachePolicy == CachePolicyRevalidate || cachePolicy == CachePolicyCache || cachePolicy == CachePolicyVerify);
</span><span class="cx">
</span><del>- if (cachePolicy == CachePolicyRevalidate)
</del><ins>+ if (cachePolicy == CachePolicyRevalidate) {
+ FEATURE_COUNTER_INCREMENT_KEY(cachedResourceLoader.frame()->page(), FeatureCounterCachedResourceRevalidationReasonReloadKey);
</ins><span class="cx"> return true;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if (m_response.cacheControlContainsNoCache() || m_response.cacheControlContainsNoStore()) {
</span><span class="cx"> LOG(ResourceLoading, "CachedResource %p mustRevalidate because of m_response.cacheControlContainsNoCache() || m_response.cacheControlContainsNoStore()\n", this);
</span><ins>+ if (m_response.cacheControlContainsNoStore())
+ FEATURE_COUNTER_INCREMENT_KEY(cachedResourceLoader.frame()->page(), FeatureCounterCachedResourceRevalidationReasonNoStoreKey);
+ else
+ FEATURE_COUNTER_INCREMENT_KEY(cachedResourceLoader.frame()->page(), FeatureCounterCachedResourceRevalidationReasonNoCacheKey);
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (cachePolicy == CachePolicyCache) {
</span><span class="cx"> if (m_response.cacheControlContainsMustRevalidate() && isExpired()) {
</span><span class="cx"> LOG(ResourceLoading, "CachedResource %p mustRevalidate because of cachePolicy == CachePolicyCache and m_response.cacheControlContainsMustRevalidate() && isExpired()\n", this);
</span><ins>+ FEATURE_COUNTER_INCREMENT_KEY(cachedResourceLoader.frame()->page(), FeatureCounterCachedResourceRevalidationReasonMustRevalidateIsExpiredKey);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -784,6 +793,7 @@
</span><span class="cx"> // CachePolicyVerify
</span><span class="cx"> if (isExpired()) {
</span><span class="cx"> LOG(ResourceLoading, "CachedResource %p mustRevalidate because of isExpired()\n", this);
</span><ins>+ FEATURE_COUNTER_INCREMENT_KEY(cachedResourceLoader.frame()->page(), FeatureCounterCachedResourceRevalidationReasonIsExpiredKey);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.h (179209 => 179210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.h 2015-01-27 21:19:18 UTC (rev 179209)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.h 2015-01-27 21:27:09 UTC (rev 179210)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx">
</span><span class="cx"> bool canUseCacheValidator() const;
</span><span class="cx">
</span><del>- virtual bool mustRevalidateDueToCacheHeaders(CachePolicy) const;
</del><ins>+ virtual bool mustRevalidateDueToCacheHeaders(const CachedResourceLoader&, CachePolicy) const;
</ins><span class="cx">
</span><span class="cx"> bool isCacheValidator() const { return m_resourceToRevalidate; }
</span><span class="cx"> CachedResource* resourceToRevalidate() const { return m_resourceToRevalidate; }
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp (179209 => 179210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-01-27 21:19:18 UTC (rev 179209)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-01-27 21:27:09 UTC (rev 179210)
</span><span class="lines">@@ -634,7 +634,7 @@
</span><span class="cx"> return Use;
</span><span class="cx">
</span><span class="cx"> // Check if the cache headers requires us to revalidate (cache expiration for example).
</span><del>- if (existingResource->mustRevalidateDueToCacheHeaders(cachePolicy(type))) {
</del><ins>+ if (existingResource->mustRevalidateDueToCacheHeaders(*this, cachePolicy(type))) {
</ins><span class="cx"> // See if the resource has usable ETag or Last-modified headers.
</span><span class="cx"> if (existingResource->canUseCacheValidator())
</span><span class="cx"> return Revalidate;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformFeatureCounterKeysh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h (179209 => 179210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-27 21:19:18 UTC (rev 179209)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-27 21:27:09 UTC (rev 179210)
</span><span class="lines">@@ -61,6 +61,15 @@
</span><span class="cx"> static const char FeatureCounterPageCacheFailureKey[] = "com.apple.WebKit.pageCache.failure";
</span><span class="cx"> static const char FeatureCounterPageCacheSuccessKey[] = "com.apple.WebKit.pageCache.success";
</span><span class="cx">
</span><ins>+// Cached resources revalidation.
+static const char FeatureCounterCachedResourceRevalidationSuccessKey[] = "com.apple.WebKit.cachedResourceRevalidation.success";
+static const char FeatureCounterCachedResourceRevalidationFailureKey[] = "com.apple.WebKit.cachedResourceRevalidation.failure";
+static const char FeatureCounterCachedResourceRevalidationReasonReloadKey[] = "com.apple.WebKit.cachedResourceRevalidation.reason.reload";
+static const char FeatureCounterCachedResourceRevalidationReasonNoCacheKey[] = "com.apple.WebKit.cachedResourceRevalidation.reason.noCache";
+static const char FeatureCounterCachedResourceRevalidationReasonNoStoreKey[] = "com.apple.WebKit.cachedResourceRevalidation.reason.noStore";
+static const char FeatureCounterCachedResourceRevalidationReasonMustRevalidateIsExpiredKey[] = "com.apple.WebKit.cachedResourceRevalidation.reason.mustRevalidateIsExpired";
+static const char FeatureCounterCachedResourceRevalidationReasonIsExpiredKey[] = "com.apple.WebKit.cachedResourceRevalidation.reason.isExpired";
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // FeatureCounterKeys_h
</span></span></pre>
</div>
</div>
</body>
</html>