<!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>[177504] 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/177504">177504</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-12-18 10:42:27 -0800 (Thu, 18 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Log navigation types using FeatureCounter API
https://bugs.webkit.org/show_bug.cgi?id=139753
Reviewed by Darin Adler.
Log navigation types using FeatureCounter API.
No new tests, no behavior change other than additional feature
counting.
* loader/FrameLoader.cpp:
(WebCore::logNavigationWithFeatureCounter):
(WebCore::FrameLoader::loadWithDocumentLoader):
* platform/FeatureCounterKeys.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="#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 (177503 => 177504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-18 18:36:22 UTC (rev 177503)
+++ trunk/Source/WebCore/ChangeLog 2014-12-18 18:42:27 UTC (rev 177504)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-12-18 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Log navigation types using FeatureCounter API
+ https://bugs.webkit.org/show_bug.cgi?id=139753
+
+ Reviewed by Darin Adler.
+
+ Log navigation types using FeatureCounter API.
+
+ No new tests, no behavior change other than additional feature
+ counting.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::logNavigationWithFeatureCounter):
+ (WebCore::FrameLoader::loadWithDocumentLoader):
+ * platform/FeatureCounterKeys.h:
+
+2014-12-18 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Move 'font-weight' CSS property to the new StyleBuilder
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139765
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (177503 => 177504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-12-18 18:36:22 UTC (rev 177503)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-12-18 18:42:27 UTC (rev 177504)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventHandler.h"
</span><span class="cx"> #include "EventNames.h"
</span><ins>+#include "FeatureCounter.h"
</ins><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "FormState.h"
</span><span class="cx"> #include "FormSubmission.h"
</span><span class="lines">@@ -1377,6 +1378,39 @@
</span><span class="cx"> loadWithDocumentLoader(newDocumentLoader, type, 0, AllowNavigationToInvalidURL::Yes);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void logNavigationWithFeatureCounter(Page* page, FrameLoadType type)
+{
+ const char* key;
+ switch (type) {
+ case FrameLoadType::Standard:
+ key = FeatureCounterNavigationStandard;
+ break;
+ case FrameLoadType::Back:
+ key = FeatureCounterNavigationBack;
+ break;
+ case FrameLoadType::Forward:
+ key = FeatureCounterNavigationForward;
+ break;
+ case FrameLoadType::IndexedBackForward:
+ key = FeatureCounterNavigationIndexedBackForward;
+ break;
+ case FrameLoadType::Reload:
+ key = FeatureCounterNavigationReload;
+ break;
+ case FrameLoadType::Same:
+ key = FeatureCounterNavigationSame;
+ break;
+ case FrameLoadType::ReloadFromOrigin:
+ key = FeatureCounterNavigationReloadFromOrigin;
+ break;
+ case FrameLoadType::Replace:
+ case FrameLoadType::RedirectWithLockedBackForwardList:
+ // Not logging those for now.
+ return;
+ }
+ FEATURE_COUNTER_INCREMENT_KEY(page, key);
+}
+
</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">@@ -1395,6 +1429,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())
+ logNavigationWithFeatureCounter(m_frame.page(), 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="trunkSourceWebCoreplatformFeatureCounterKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/FeatureCounterKeys.h (177503 => 177504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/FeatureCounterKeys.h 2014-12-18 18:36:22 UTC (rev 177503)
+++ trunk/Source/WebCore/platform/FeatureCounterKeys.h 2014-12-18 18:42:27 UTC (rev 177504)
</span><span class="lines">@@ -70,6 +70,15 @@
</span><span class="cx"> static const char FeatureCounterCachedResourceRevalidationReasonMustRevalidateIsExpiredKey[] = "com.apple.WebKit.cachedResourceRevalidation.reason.mustRevalidateIsExpired";
</span><span class="cx"> static const char FeatureCounterCachedResourceRevalidationReasonIsExpiredKey[] = "com.apple.WebKit.cachedResourceRevalidation.reason.isExpired";
</span><span class="cx">
</span><ins>+// Navigation types.
+static const char FeatureCounterNavigationStandard[] = "com.apple.WebKit.navigation.standard";
+static const char FeatureCounterNavigationBack[] = "com.apple.WebKit.navigation.back";
+static const char FeatureCounterNavigationForward[] = "com.apple.WebKit.navigation.forward";
+static const char FeatureCounterNavigationIndexedBackForward[] = "com.apple.WebKit.navigation.indexedBackForward";
+static const char FeatureCounterNavigationReload[] = "com.apple.WebKit.navigation.reload";
+static const char FeatureCounterNavigationSame[] = "com.apple.WebKit.navigation.same";
+static const char FeatureCounterNavigationReloadFromOrigin[] = "com.apple.WebKit.navigation.reloadFromOrigin";
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // FeatureCounterKeys_h
</span></span></pre>
</div>
</div>
</body>
</html>