<!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>[178298] 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/178298">178298</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-12 14:30:59 -0800 (Mon, 12 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Log navigation types using DiagnosticLoggingClient
https://bugs.webkit.org/show_bug.cgi?id=140323
Reviewed by Darin Adler.
Log navigation types using DiagnosticLoggingClient to help us understand
what types of navigations are common and give us an estimate on the
total number of navigations.
* loader/FrameLoader.cpp:
(WebCore::logNavigation):
(WebCore::FrameLoader::loadWithDocumentLoader):
(WebCore::logNavigationWithFeatureCounter): Deleted.
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::navigationKey):
* page/DiagnosticLoggingKeys.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.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 (178297 => 178298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-12 22:02:56 UTC (rev 178297)
+++ trunk/Source/WebCore/ChangeLog 2015-01-12 22:30:59 UTC (rev 178298)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-12 Chris Dumez <cdumez@apple.com>
+
+ Log navigation types using DiagnosticLoggingClient
+ https://bugs.webkit.org/show_bug.cgi?id=140323
+
+ Reviewed by Darin Adler.
+
+ Log navigation types using DiagnosticLoggingClient to help us understand
+ what types of navigations are common and give us an estimate on the
+ total number of navigations.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::logNavigation):
+ (WebCore::FrameLoader::loadWithDocumentLoader):
+ (WebCore::logNavigationWithFeatureCounter): Deleted.
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::navigationKey):
+ * page/DiagnosticLoggingKeys.h:
+
</ins><span class="cx"> 2015-01-12 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: ASSERT under WebCore::InspectorResourceAgent::loadResource
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (178297 => 178298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-12 22:02:56 UTC (rev 178297)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-12 22:30:59 UTC (rev 178298)
</span><span class="lines">@@ -1377,37 +1377,50 @@
</span><span class="cx"> loadWithDocumentLoader(newDocumentLoader, type, 0, AllowNavigationToInvalidURL::Yes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void logNavigationWithFeatureCounter(Page* page, FrameLoadType type)
</del><ins>+static void logNavigation(MainFrame& frame, FrameLoadType type)
</ins><span class="cx"> {
</span><del>- const char* key;
</del><ins>+ const char* featureCounterKey;
+ String navigationDescription;
</ins><span class="cx"> switch (type) {
</span><span class="cx"> case FrameLoadType::Standard:
</span><del>- key = FeatureCounterNavigationStandardKey;
</del><ins>+ featureCounterKey = FeatureCounterNavigationStandardKey;
+ navigationDescription = ASCIILiteral("standard");
</ins><span class="cx"> break;
</span><span class="cx"> case FrameLoadType::Back:
</span><del>- key = FeatureCounterNavigationBackKey;
</del><ins>+ featureCounterKey = FeatureCounterNavigationBackKey;
+ navigationDescription = ASCIILiteral("back");
</ins><span class="cx"> break;
</span><span class="cx"> case FrameLoadType::Forward:
</span><del>- key = FeatureCounterNavigationForwardKey;
</del><ins>+ featureCounterKey = FeatureCounterNavigationForwardKey;
+ navigationDescription = ASCIILiteral("forward");
</ins><span class="cx"> break;
</span><span class="cx"> case FrameLoadType::IndexedBackForward:
</span><del>- key = FeatureCounterNavigationIndexedBackForwardKey;
</del><ins>+ featureCounterKey = FeatureCounterNavigationIndexedBackForwardKey;
+ navigationDescription = ASCIILiteral("indexedBackForward");
</ins><span class="cx"> break;
</span><span class="cx"> case FrameLoadType::Reload:
</span><del>- key = FeatureCounterNavigationReloadKey;
</del><ins>+ featureCounterKey = FeatureCounterNavigationReloadKey;
+ navigationDescription = ASCIILiteral("reload");
</ins><span class="cx"> break;
</span><span class="cx"> case FrameLoadType::Same:
</span><del>- key = FeatureCounterNavigationSameKey;
</del><ins>+ featureCounterKey = FeatureCounterNavigationSameKey;
+ navigationDescription = ASCIILiteral("same");
</ins><span class="cx"> break;
</span><span class="cx"> case FrameLoadType::ReloadFromOrigin:
</span><del>- key = FeatureCounterNavigationReloadFromOriginKey;
</del><ins>+ featureCounterKey = FeatureCounterNavigationReloadFromOriginKey;
+ navigationDescription = ASCIILiteral("reloadFromOrigin");
</ins><span class="cx"> break;
</span><span class="cx"> case FrameLoadType::Replace:
</span><span class="cx"> case FrameLoadType::RedirectWithLockedBackForwardList:
</span><span class="cx"> // Not logging those for now.
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(page, key);
</del><ins>+ if (frame.settings().diagnosticLoggingEnabled()) {
+ if (auto* client = frame.diagnosticLoggingClient())
+ client->logDiagnosticMessage(DiagnosticLoggingKeys::navigationKey(), navigationDescription);
+ }
+ // FIXME: Remove once DiagnosticLoggingClient works on iOS.
+ FEATURE_COUNTER_INCREMENT_KEY(frame.page(), featureCounterKey);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType type, PassRefPtr<FormState> prpFormState, AllowNavigationToInvalidURL allowNavigationToInvalidURL)
</span><span class="lines">@@ -1430,7 +1443,7 @@
</span><span class="cx">
</span><span class="cx"> // Log main frame navigation types.
</span><span class="cx"> if (m_frame.isMainFrame())
</span><del>- logNavigationWithFeatureCounter(m_frame.page(), type);
</del><ins>+ logNavigation(static_cast<MainFrame&>(m_frame), type);
</ins><span class="cx">
</span><span class="cx"> policyChecker().setLoadType(type);
</span><span class="cx"> RefPtr<FormState> formState = prpFormState;
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (178297 => 178298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2015-01-12 22:02:56 UTC (rev 178297)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2015-01-12 22:30:59 UTC (rev 178298)
</span><span class="lines">@@ -93,5 +93,10 @@
</span><span class="cx"> return WTF::ASCIILiteral("engineFailedToLoad");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WTF::String DiagnosticLoggingKeys::navigationKey()
+{
+ return WTF::ASCIILiteral("navigation");
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (178297 => 178298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2015-01-12 22:02:56 UTC (rev 178297)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2015-01-12 22:30:59 UTC (rev 178298)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> static String pageContainsAtLeastOneMediaEngineKey();
</span><span class="cx"> static String pageLoadedKey();
</span><span class="cx"> static String engineFailedToLoadKey();
</span><ins>+ static String navigationKey();
</ins><span class="cx">
</span><span class="cx"> // Success keys.
</span><span class="cx"> static String passKey();
</span></span></pre>
</div>
</div>
</body>
</html>