<!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>[179897] branches/safari-600.5-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/179897">179897</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-02-10 16:05:05 -0800 (Tue, 10 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/178298">r178298</a>. rdar://problem/19526083</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchSourceWebCoreChangeLog">branches/safari-600.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderFrameLoadercpp">branches/safari-600.5-branch/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageDiagnosticLoggingKeyscpp">branches/safari-600.5-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageDiagnosticLoggingKeysh">branches/safari-600.5-branch/Source/WebCore/page/DiagnosticLoggingKeys.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (179896 => 179897)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-02-11 00:00:53 UTC (rev 179896)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-02-11 00:05:05 UTC (rev 179897)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-02-10 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r177504 & r178298
+
+ 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:
+
+2015-02-10 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r176899
</span><span class="cx">
</span><span class="cx"> 2014-12-05 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/FrameLoader.cpp (179896 => 179897)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/FrameLoader.cpp 2015-02-11 00:00:53 UTC (rev 179896)
+++ branches/safari-600.5-branch/Source/WebCore/loader/FrameLoader.cpp 2015-02-11 00:05:05 UTC (rev 179897)
</span><span class="lines">@@ -1424,6 +1424,44 @@
</span><span class="cx"> loadWithDocumentLoader(newDocumentLoader, type, 0, AllowNavigationToInvalidURL::Yes);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void logNavigation(MainFrame& frame, FrameLoadType type)
+{
+ String navigationDescription;
+ switch (type) {
+ case FrameLoadType::Standard:
+ navigationDescription = ASCIILiteral("standard");
+ break;
+ case FrameLoadType::Back:
+ navigationDescription = ASCIILiteral("back");
+ break;
+ case FrameLoadType::Forward:
+ navigationDescription = ASCIILiteral("forward");
+ break;
+ case FrameLoadType::IndexedBackForward:
+ navigationDescription = ASCIILiteral("indexedBackForward");
+ break;
+ case FrameLoadType::Reload:
+ navigationDescription = ASCIILiteral("reload");
+ break;
+ case FrameLoadType::Same:
+ navigationDescription = ASCIILiteral("same");
+ break;
+ case FrameLoadType::ReloadFromOrigin:
+ navigationDescription = ASCIILiteral("reloadFromOrigin");
+ break;
+ case FrameLoadType::Replace:
+ case FrameLoadType::RedirectWithLockedBackForwardList:
+ // Not logging those for now.
+ return;
+ }
+
+ if (frame.settings().diagnosticLoggingEnabled()) {
+ if (auto* client = frame.diagnosticLoggingClient())
+ client->logDiagnosticMessage(DiagnosticLoggingKeys::navigationKey(), navigationDescription);
+ }
+}
+
+
</ins><span class="cx"> void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType type, PassRefPtr<FormState> prpFormState, AllowNavigationToInvalidURL allowNavigationToInvalidURL)
</span><span class="cx"> {
</span><span class="cx"> // Retain because dispatchBeforeLoadEvent may release the last reference to it.
</span><span class="lines">@@ -1442,6 +1480,10 @@
</span><span class="cx"> if (m_frame.document())
</span><span class="cx"> m_previousURL = m_frame.document()->url();
</span><span class="cx">
</span><ins>+ // Log main frame navigation types.
+ if (m_frame.isMainFrame())
+ logNavigation(static_cast<MainFrame&>(m_frame), type);
+
</ins><span class="cx"> policyChecker().setLoadType(type);
</span><span class="cx"> RefPtr<FormState> formState = prpFormState;
</span><span class="cx"> bool isFormSubmission = formState;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp (179896 => 179897)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2015-02-11 00:00:53 UTC (rev 179896)
+++ branches/safari-600.5-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2015-02-11 00:05:05 UTC (rev 179897)
</span><span class="lines">@@ -88,4 +88,9 @@
</span><span class="cx"> return WTF::ASCIILiteral("pageLoaded");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WTF::String DiagnosticLoggingKeys::navigationKey()
+{
+ return WTF::ASCIILiteral("navigation");
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/DiagnosticLoggingKeys.h (179896 => 179897)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/DiagnosticLoggingKeys.h 2015-02-11 00:00:53 UTC (rev 179896)
+++ branches/safari-600.5-branch/Source/WebCore/page/DiagnosticLoggingKeys.h 2015-02-11 00:05:05 UTC (rev 179897)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> static String pageContainsMediaEngineKey();
</span><span class="cx"> static String pageContainsAtLeastOneMediaEngineKey();
</span><span class="cx"> static String pageLoadedKey();
</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>