<!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>[179533] 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/179533">179533</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-02-02 18:22:51 -0800 (Mon, 02 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add diagnostic logging for ResourceResponse's source
https://bugs.webkit.org/show_bug.cgi?id=141170
<rdar://problem/19632080>
Reviewed by Antti Koivisto.
Add diagnostic logging for ResourceResponse's source (network, disk
cache, disk cache after validation) to give us an idea of our network
cache efficacy.
* loader/ResourceLoader.cpp:
(WebCore::logResourceResponseSource):
(WebCore::ResourceLoader::didReceiveResponse):
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::networkKey):
(WebCore::DiagnosticLoggingKeys::diskCacheKey):
(WebCore::DiagnosticLoggingKeys::diskCacheAfterValidationKey):
(WebCore::DiagnosticLoggingKeys::resourceResponseKey):
(WebCore::DiagnosticLoggingKeys::scriptKey):
(WebCore::DiagnosticLoggingKeys::sourceKey):
* page/DiagnosticLoggingKeys.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadercpp">trunk/Source/WebCore/loader/ResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingKeyscpp">trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingKeysh">trunk/Source/WebCore/page/DiagnosticLoggingKeys.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179532 => 179533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-02-03 02:22:07 UTC (rev 179532)
+++ trunk/Source/WebCore/ChangeLog        2015-02-03 02:22:51 UTC (rev 179533)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-02-02 Chris Dumez <cdumez@apple.com>
+
+ Add diagnostic logging for ResourceResponse's source
+ https://bugs.webkit.org/show_bug.cgi?id=141170
+ <rdar://problem/19632080>
+
+ Reviewed by Antti Koivisto.
+
+ Add diagnostic logging for ResourceResponse's source (network, disk
+ cache, disk cache after validation) to give us an idea of our network
+ cache efficacy.
+
+ * loader/ResourceLoader.cpp:
+ (WebCore::logResourceResponseSource):
+ (WebCore::ResourceLoader::didReceiveResponse):
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::networkKey):
+ (WebCore::DiagnosticLoggingKeys::diskCacheKey):
+ (WebCore::DiagnosticLoggingKeys::diskCacheAfterValidationKey):
+ (WebCore::DiagnosticLoggingKeys::resourceResponseKey):
+ (WebCore::DiagnosticLoggingKeys::scriptKey):
+ (WebCore::DiagnosticLoggingKeys::sourceKey):
+ * page/DiagnosticLoggingKeys.h:
+
</ins><span class="cx"> 2015-02-02 Dhi Aurrahman <diorahman@rockybars.com>
</span><span class="cx">
</span><span class="cx"> Optimize matchesLangPseudoClass() of :lang()
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (179532 => 179533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.cpp        2015-02-03 02:22:07 UTC (rev 179532)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp        2015-02-03 02:22:51 UTC (rev 179533)
</span><span class="lines">@@ -32,12 +32,15 @@
</span><span class="cx">
</span><span class="cx"> #include "ApplicationCacheHost.h"
</span><span class="cx"> #include "AuthenticationChallenge.h"
</span><ins>+#include "DiagnosticLoggingClient.h"
+#include "DiagnosticLoggingKeys.h"
</ins><span class="cx"> #include "DocumentLoader.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "LoaderStrategy.h"
</span><ins>+#include "MainFrame.h"
</ins><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PlatformStrategies.h"
</span><span class="cx"> #include "ProgressTracker.h"
</span><span class="lines">@@ -294,6 +297,29 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void logResourceResponseSource(Frame* frame, ResourceResponse::Source source)
+{
+ if (!frame)
+ return;
+
+ String sourceKey;
+ switch (source) {
+ case ResourceResponse::Source::Network:
+ sourceKey = DiagnosticLoggingKeys::networkKey();
+ break;
+ case ResourceResponse::Source::DiskCache:
+ sourceKey = DiagnosticLoggingKeys::diskCacheKey();
+ break;
+ case ResourceResponse::Source::DiskCacheAfterValidation:
+ sourceKey = DiagnosticLoggingKeys::diskCacheAfterValidationKey();
+ break;
+ case ResourceResponse::Source::Unknown:
+ return;
+ }
+
+ frame->mainFrame().diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::resourceResponseKey(), DiagnosticLoggingKeys::sourceKey(), sourceKey);
+}
+
</ins><span class="cx"> void ResourceLoader::didReceiveResponse(const ResourceResponse& r)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_reachedTerminalState);
</span><span class="lines">@@ -302,6 +328,8 @@
</span><span class="cx"> // anything including possibly derefing this; one example of this is Radar 3266216.
</span><span class="cx"> Ref<ResourceLoader> protect(*this);
</span><span class="cx">
</span><ins>+ logResourceResponseSource(m_frame.get(), r.source());
+
</ins><span class="cx"> m_response = r;
</span><span class="cx">
</span><span class="cx"> if (FormData* data = m_request.httpBody())
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (179532 => 179533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp        2015-02-03 02:22:07 UTC (rev 179532)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp        2015-02-03 02:22:51 UTC (rev 179533)
</span><span class="lines">@@ -103,6 +103,11 @@
</span><span class="cx"> return ASCIILiteral("navigation");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::networkKey()
+{
+ return ASCIILiteral("network");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::noCacheKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("noCache");
</span><span class="lines">@@ -263,6 +268,16 @@
</span><span class="cx"> return ASCIILiteral("deviceProximity");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::diskCacheKey()
+{
+ return ASCIILiteral("diskCache");
+}
+
+String DiagnosticLoggingKeys::diskCacheAfterValidationKey()
+{
+ return ASCIILiteral("diskCacheAfterValidation");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::reloadKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("reload");
</span><span class="lines">@@ -278,6 +293,11 @@
</span><span class="cx"> return ASCIILiteral("resourceRequest");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::resourceResponseKey()
+{
+ return ASCIILiteral("resourceResponse");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::revalidatingKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("revalidating");
</span><span class="lines">@@ -298,6 +318,11 @@
</span><span class="cx"> return ASCIILiteral("script");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::sourceKey()
+{
+ return ASCIILiteral("sourceKey");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::styleSheetKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("styleSheet");
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (179532 => 179533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h        2015-02-03 02:22:07 UTC (rev 179532)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h        2015-02-03 02:22:51 UTC (rev 179533)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx"> static String deviceMotionKey();
</span><span class="cx"> static String deviceOrientationKey();
</span><span class="cx"> static String deviceProximityKey();
</span><ins>+ static String diskCacheKey();
+ static String diskCacheAfterValidationKey();
</ins><span class="cx"> static String documentLoaderStoppingKey();
</span><span class="cx"> static String engineFailedToLoadKey();
</span><span class="cx"> static String expiredKey();
</span><span class="lines">@@ -61,6 +63,7 @@
</span><span class="cx"> static String mediaLoadingFailedKey();
</span><span class="cx"> static String mustRevalidateIsExpiredKey();
</span><span class="cx"> static String navigationKey();
</span><ins>+ static String networkKey();
</ins><span class="cx"> static String noCacheKey();
</span><span class="cx"> static String noCurrentHistoryItemKey();
</span><span class="cx"> static String noDocumentLoaderKey();
</span><span class="lines">@@ -86,9 +89,11 @@
</span><span class="cx"> static String reloadKey();
</span><span class="cx"> static String resourceKey();
</span><span class="cx"> static String resourceRequestKey();
</span><ins>+ static String resourceResponseKey();
</ins><span class="cx"> static String revalidatingKey();
</span><span class="cx"> static String sameLoadKey();
</span><span class="cx"> static String scriptKey();
</span><ins>+ static String sourceKey();
</ins><span class="cx"> static String styleSheetKey();
</span><span class="cx"> static String svgDocumentKey();
</span><span class="cx"> static String unusedKey();
</span></span></pre>
</div>
</div>
</body>
</html>