<!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>[179285] 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/179285">179285</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-01-28 13:39:26 -0800 (Wed, 28 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/177681">r177681</a>. rdar://problem/19445913</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="#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 (179284 => 179285)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-28 21:37:40 UTC (rev 179284)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-28 21:39:26 UTC (rev 179285)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-01-28 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r177681
+
+ 2014-12-22 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Log which type of resources are commonly loaded using FeatureCounter
+ https://bugs.webkit.org/show_bug.cgi?id=139890
+
+ Reviewed by Darin Adler.
+
+ Log which type of resources are commonly loaded using FeatureCounter
+ (e.g. stylesheets, scripts, fonts, images, ...).
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::logResourceLoadedUsingFeatureCounter):
+ (WebCore::SubresourceLoader::didFinishLoading):
+ * platform/FeatureCounterKeys.h:
+
+2015-01-28 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r177680
</span><span class="cx">
</span><span class="cx"> 2014-12-22 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 (179284 => 179285)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/loader/SubresourceLoader.cpp 2015-01-28 21:37:40 UTC (rev 179284)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/loader/SubresourceLoader.cpp 2015-01-28 21:39:26 UTC (rev 179285)
</span><span class="lines">@@ -292,6 +292,47 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void logResourceLoadedUsingFeatureCounter(Page* page, CachedResource::Type type)
+{
+ const char* key;
+ switch (type) {
+ case CachedResource::MainResource:
+ key = FeatureCounterResourceLoadedMainResourceKey;
+ break;
+ case CachedResource::ImageResource:
+ key = FeatureCounterResourceLoadedImageKey;
+ break;
+#if ENABLE(XSLT)
+ case CachedResource::XSLStyleSheet:
+#endif
+ case CachedResource::CSSStyleSheet:
+ key = FeatureCounterResourceLoadedStyleSheetKey;
+ break;
+ case CachedResource::Script:
+ key = FeatureCounterResourceLoadedScriptKey;
+ break;
+ case CachedResource::FontResource:
+ key = FeatureCounterResourceLoadedFontKey;
+ break;
+ case CachedResource::RawResource:
+ key = FeatureCounterResourceLoadedRawKey;
+ break;
+ case CachedResource::SVGDocumentResource:
+ key = FeatureCounterResourceLoadedSVGDocumentKey;
+ break;
+#if ENABLE(LINK_PREFETCH)
+ case CachedResource::LinkPrefetch:
+ case CachedResource::LinkSubresource:
+#endif
+#if ENABLE(VIDEO_TRACK)
+ case CachedResource::TextTrackResource:
+#endif
+ key = FeatureCounterResourceLoadedOtherKey;
+ break;
+ }
+ FEATURE_COUNTER_INCREMENT_KEY(page, key);
+}
+
</ins><span class="cx"> void SubresourceLoader::didFinishLoading(double finishTime)
</span><span class="cx"> {
</span><span class="cx"> if (m_state != Initialized)
</span><span class="lines">@@ -301,6 +342,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><ins>+ logResourceLoadedUsingFeatureCounter(m_frame ? m_frame->page() : nullptr, m_resource->type());
</ins><span class="cx">
</span><span class="cx"> Ref<SubresourceLoader> protect(*this);
</span><span class="cx">
</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 (179284 => 179285)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-28 21:37:40 UTC (rev 179284)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-28 21:39:26 UTC (rev 179285)
</span><span class="lines">@@ -87,6 +87,16 @@
</span><span class="cx"> static const char FeatureCounterNavigationSame[] = "com.apple.WebKit.navigation.same";
</span><span class="cx"> static const char FeatureCounterNavigationReloadFromOrigin[] = "com.apple.WebKit.navigation.reloadFromOrigin";
</span><span class="cx">
</span><ins>+// 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";
+
</ins><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>