<!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>[178733] 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/178733">178733</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-20 12:37:20 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Log types of resources being loaded using DiagnosticLoggingClient
https://bugs.webkit.org/show_bug.cgi?id=140682
Reviewed by Andreas Kling.
Log types of resources being loaded using DiagnosticLoggingClient
instead of the legacy FeatureCounter.
* loader/SubresourceLoader.cpp:
(WebCore::logResourceLoaded):
(WebCore::SubresourceLoader::didFinishLoading):
(WebCore::logResourceLoadedUsingFeatureCounter): Deleted.
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::otherKey):
(WebCore::DiagnosticLoggingKeys::mainResourceKey):
(WebCore::DiagnosticLoggingKeys::loadedKey):
(WebCore::DiagnosticLoggingKeys::imageKey):
(WebCore::DiagnosticLoggingKeys::rawKey):
(WebCore::DiagnosticLoggingKeys::resourceKey):
(WebCore::DiagnosticLoggingKeys::scriptKey):
(WebCore::DiagnosticLoggingKeys::styleSheetKey):
(WebCore::DiagnosticLoggingKeys::svgDocumentKey):
(WebCore::DiagnosticLoggingKeys::fontKey):
* page/DiagnosticLoggingKeys.h:
* platform/FeatureCounterKeys.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoadercpp">trunk/Source/WebCore/loader/SubresourceLoader.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>
<li><a href="#trunkSourceWebCoreplatformFeatureCounterKeysh">trunk/Source/WebCore/platform/FeatureCounterKeys.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178732 => 178733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-20 20:36:38 UTC (rev 178732)
+++ trunk/Source/WebCore/ChangeLog 2015-01-20 20:37:20 UTC (rev 178733)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-01-20 Chris Dumez <cdumez@apple.com>
+
+ Log types of resources being loaded using DiagnosticLoggingClient
+ https://bugs.webkit.org/show_bug.cgi?id=140682
+
+ Reviewed by Andreas Kling.
+
+ Log types of resources being loaded using DiagnosticLoggingClient
+ instead of the legacy FeatureCounter.
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::logResourceLoaded):
+ (WebCore::SubresourceLoader::didFinishLoading):
+ (WebCore::logResourceLoadedUsingFeatureCounter): Deleted.
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::otherKey):
+ (WebCore::DiagnosticLoggingKeys::mainResourceKey):
+ (WebCore::DiagnosticLoggingKeys::loadedKey):
+ (WebCore::DiagnosticLoggingKeys::imageKey):
+ (WebCore::DiagnosticLoggingKeys::rawKey):
+ (WebCore::DiagnosticLoggingKeys::resourceKey):
+ (WebCore::DiagnosticLoggingKeys::scriptKey):
+ (WebCore::DiagnosticLoggingKeys::styleSheetKey):
+ (WebCore::DiagnosticLoggingKeys::svgDocumentKey):
+ (WebCore::DiagnosticLoggingKeys::fontKey):
+ * page/DiagnosticLoggingKeys.h:
+ * platform/FeatureCounterKeys.h:
+
</ins><span class="cx"> 2015-01-20 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Remove redundant style.preserveNewline check when collapsing trailing whitespace.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (178732 => 178733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2015-01-20 20:36:38 UTC (rev 178732)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2015-01-20 20:37:20 UTC (rev 178733)
</span><span class="lines">@@ -30,14 +30,18 @@
</span><span class="cx"> #include "SubresourceLoader.h"
</span><span class="cx">
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><ins>+#include "DiagnosticLoggingClient.h"
+#include "DiagnosticLoggingKeys.h"
</ins><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "DocumentLoader.h"
</span><span class="cx"> #include "FeatureCounter.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "MainFrame.h"
</ins><span class="cx"> #include "MemoryCache.h"
</span><span class="cx"> #include "Page.h"
</span><ins>+#include "Settings.h"
</ins><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx"> #include <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -292,36 +296,39 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void logResourceLoadedUsingFeatureCounter(Page* page, CachedResource::Type type)
</del><ins>+static void logResourceLoaded(Frame* frame, CachedResource::Type type)
</ins><span class="cx"> {
</span><del>- const char* key;
</del><ins>+ if (!frame || !frame->settings().diagnosticLoggingEnabled())
+ return;
+
+ String resourceType;
</ins><span class="cx"> switch (type) {
</span><span class="cx"> case CachedResource::MainResource:
</span><del>- key = FeatureCounterResourceLoadedMainResourceKey;
</del><ins>+ resourceType = DiagnosticLoggingKeys::mainResourceKey();
</ins><span class="cx"> break;
</span><span class="cx"> case CachedResource::ImageResource:
</span><del>- key = FeatureCounterResourceLoadedImageKey;
</del><ins>+ resourceType = DiagnosticLoggingKeys::imageKey();
</ins><span class="cx"> break;
</span><span class="cx"> #if ENABLE(XSLT)
</span><span class="cx"> case CachedResource::XSLStyleSheet:
</span><span class="cx"> #endif
</span><span class="cx"> case CachedResource::CSSStyleSheet:
</span><del>- key = FeatureCounterResourceLoadedStyleSheetKey;
</del><ins>+ resourceType = DiagnosticLoggingKeys::styleSheetKey();
</ins><span class="cx"> break;
</span><span class="cx"> case CachedResource::Script:
</span><del>- key = FeatureCounterResourceLoadedScriptKey;
</del><ins>+ resourceType = DiagnosticLoggingKeys::scriptKey();
</ins><span class="cx"> break;
</span><span class="cx"> case CachedResource::FontResource:
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="cx"> case CachedResource::SVGFontResource:
</span><span class="cx"> #endif
</span><del>- key = FeatureCounterResourceLoadedFontKey;
</del><ins>+ resourceType = DiagnosticLoggingKeys::fontKey();
</ins><span class="cx"> break;
</span><span class="cx"> case CachedResource::RawResource:
</span><del>- key = FeatureCounterResourceLoadedRawKey;
</del><ins>+ resourceType = DiagnosticLoggingKeys::rawKey();
</ins><span class="cx"> break;
</span><span class="cx"> case CachedResource::SVGDocumentResource:
</span><del>- key = FeatureCounterResourceLoadedSVGDocumentKey;
</del><ins>+ resourceType = DiagnosticLoggingKeys::svgDocumentKey();
</ins><span class="cx"> break;
</span><span class="cx"> #if ENABLE(LINK_PREFETCH)
</span><span class="cx"> case CachedResource::LinkPrefetch:
</span><span class="lines">@@ -330,10 +337,11 @@
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> case CachedResource::TextTrackResource:
</span><span class="cx"> #endif
</span><del>- key = FeatureCounterResourceLoadedOtherKey;
</del><ins>+ resourceType = DiagnosticLoggingKeys::otherKey();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(page, key);
</del><ins>+ if (auto* client = frame->mainFrame().diagnosticLoggingClient())
+ client->logDiagnosticMessageWithValue(DiagnosticLoggingKeys::resourceKey(), DiagnosticLoggingKeys::loadedKey(), resourceType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SubresourceLoader::didFinishLoading(double finishTime)
</span><span class="lines">@@ -345,7 +353,7 @@
</span><span class="cx"> // FIXME (129394): We should cancel the load when a decode error occurs instead of continuing the load to completion.
</span><span class="cx"> ASSERT(!m_resource->errorOccurred() || m_resource->status() == CachedResource::DecodeError);
</span><span class="cx"> LOG(ResourceLoading, "Received '%s'.", m_resource->url().string().latin1().data());
</span><del>- logResourceLoadedUsingFeatureCounter(m_frame ? m_frame->page() : nullptr, m_resource->type());
</del><ins>+ logResourceLoaded(m_frame.get(), m_resource->type());
</ins><span class="cx">
</span><span class="cx"> Ref<SubresourceLoader> protect(*this);
</span><span class="cx"> CachedResourceHandle<CachedResource> protectResource(m_resource);
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (178732 => 178733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2015-01-20 20:36:38 UTC (rev 178732)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2015-01-20 20:37:20 UTC (rev 178733)
</span><span class="lines">@@ -103,16 +103,31 @@
</span><span class="cx"> return ASCIILiteral("noDocumentLoader");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::otherKey()
+{
+ return ASCIILiteral("other");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::mainDocumentErrorKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("mainDocumentError");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::mainResourceKey()
+{
+ return ASCIILiteral("mainResource");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::isErrorPageKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("isErrorPage");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::loadedKey()
+{
+ return ASCIILiteral("loaded");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::hasPluginsKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("hasPlugins");
</span><span class="lines">@@ -123,6 +138,11 @@
</span><span class="cx"> return ASCIILiteral("httpsNoStore");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::imageKey()
+{
+ return ASCIILiteral("image");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::hasOpenDatabasesKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("hasOpenDatabases");
</span><span class="lines">@@ -138,6 +158,11 @@
</span><span class="cx"> return ASCIILiteral("quirkRedirectComing");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::rawKey()
+{
+ return ASCIILiteral("raw");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::loadingAPISenseKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("loadingAPISense");
</span><span class="lines">@@ -183,6 +208,11 @@
</span><span class="cx"> return ASCIILiteral("reload");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::resourceKey()
+{
+ return ASCIILiteral("resource");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::reloadFromOriginKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("reloadFromOrigin");
</span><span class="lines">@@ -193,11 +223,31 @@
</span><span class="cx"> return ASCIILiteral("sameLoad");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::scriptKey()
+{
+ return ASCIILiteral("script");
+}
+
+String DiagnosticLoggingKeys::styleSheetKey()
+{
+ return ASCIILiteral("styleSheet");
+}
+
+String DiagnosticLoggingKeys::svgDocumentKey()
+{
+ return ASCIILiteral("svgDocument");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::expiredKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("expired");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::fontKey()
+{
+ return ASCIILiteral("font");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::prunedDueToMemoryPressureKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("pruned.memoryPressure");
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (178732 => 178733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2015-01-20 20:36:38 UTC (rev 178732)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2015-01-20 20:37:20 UTC (rev 178733)
</span><span class="lines">@@ -41,17 +41,22 @@
</span><span class="cx"> static String documentLoaderStoppingKey();
</span><span class="cx"> static String engineFailedToLoadKey();
</span><span class="cx"> static String expiredKey();
</span><ins>+ static String fontKey();
</ins><span class="cx"> static String hasOpenDatabasesKey();
</span><span class="cx"> static String hasPluginsKey();
</span><span class="cx"> static String httpsNoStoreKey();
</span><ins>+ static String imageKey();
</ins><span class="cx"> static String isErrorPageKey();
</span><ins>+ static String loadedKey();
</ins><span class="cx"> static String loadingAPISenseKey();
</span><span class="cx"> static String mainDocumentErrorKey();
</span><ins>+ static String mainResourceKey();
</ins><span class="cx"> static String mediaLoadedKey();
</span><span class="cx"> static String mediaLoadingFailedKey();
</span><span class="cx"> static String navigationKey();
</span><span class="cx"> static String noCurrentHistoryItemKey();
</span><span class="cx"> static String noDocumentLoaderKey();
</span><ins>+ static String otherKey();
</ins><span class="cx"> static String pageCacheKey();
</span><span class="cx"> static String pageContainsAtLeastOneMediaEngineKey();
</span><span class="cx"> static String pageContainsAtLeastOnePluginKey();
</span><span class="lines">@@ -64,9 +69,14 @@
</span><span class="cx"> static String prunedDueToMemoryPressureKey();
</span><span class="cx"> static String prunedDueToProcessSuspended();
</span><span class="cx"> static String quirkRedirectComingKey();
</span><ins>+ static String rawKey();
</ins><span class="cx"> static String reloadFromOriginKey();
</span><span class="cx"> static String reloadKey();
</span><ins>+ static String resourceKey();
</ins><span class="cx"> static String sameLoadKey();
</span><ins>+ static String scriptKey();
+ static String styleSheetKey();
+ static String svgDocumentKey();
</ins><span class="cx">
</span><span class="cx"> // Success / Failure keys.
</span><span class="cx"> static String successKey();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformFeatureCounterKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/FeatureCounterKeys.h (178732 => 178733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-20 20:36:38 UTC (rev 178732)
+++ trunk/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-20 20:37:20 UTC (rev 178733)
</span><span class="lines">@@ -43,16 +43,6 @@
</span><span class="cx"> static const char FeatureCounterMediaVideoElementPlayedKey[] = "com.apple.WebKit.media.video.played";
</span><span class="cx"> static const char FeatureCounterMediaAudioElementPlayedKey[] = "com.apple.WebKit.media.audio.played";
</span><span class="cx">
</span><del>-// Resource types.
-static const char FeatureCounterResourceLoadedFontKey[] = "com.apple.WebKit.resource.loaded.font";
-static const char FeatureCounterResourceLoadedImageKey[] = "com.apple.WebKit.resource.loaded.image";
-static const char FeatureCounterResourceLoadedMainResourceKey[] = "com.apple.WebKit.resource.loaded.mainResource";
-static const char FeatureCounterResourceLoadedRawKey[] = "com.apple.WebKit.resource.loaded.raw";
-static const char FeatureCounterResourceLoadedSVGDocumentKey[] = "com.apple.WebKit.resource.loaded.svgDocument";
-static const char FeatureCounterResourceLoadedScriptKey[] = "com.apple.WebKit.resource.loaded.script";
-static const char FeatureCounterResourceLoadedStyleSheetKey[] = "com.apple.WebKit.resource.loaded.styleSheet";
-static const char FeatureCounterResourceLoadedOtherKey[] = "com.apple.WebKit.resource.loaded.other";
-
</del><span class="cx"> // Memory cache.
</span><span class="cx"> static const char FeatureCounterResourceRequestInMemoryCacheKey[] = "com.apple.WebKit.resourceRequest.inMemoryCache";
</span><span class="cx"> static const char FeatureCounterResourceRequestNotInMemoryCacheKey[] = "com.apple.WebKit.resourceRequest.notInMemoryCache";
</span></span></pre>
</div>
</div>
</body>
</html>