<!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>[178684] 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/178684">178684</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-19 16:58:42 -0800 (Mon, 19 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using FeatureCounter to log navigation types
https://bugs.webkit.org/show_bug.cgi?id=140642
Reviewed by Andreas Kling.
Stop using FeatureCounter to log navigation types now that
DiagnosticLoggingClient is working on iOS.
* loader/FrameLoader.cpp:
(WebCore::logNavigation):
* 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 (178683 => 178684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-20 00:39:36 UTC (rev 178683)
+++ trunk/Source/WebCore/ChangeLog 2015-01-20 00:58:42 UTC (rev 178684)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-19 Chris Dumez <cdumez@apple.com>
+
+ Stop using FeatureCounter to log navigation types
+ https://bugs.webkit.org/show_bug.cgi?id=140642
+
+ Reviewed by Andreas Kling.
+
+ Stop using FeatureCounter to log navigation types now that
+ DiagnosticLoggingClient is working on iOS.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::logNavigation):
+ * platform/FeatureCounterKeys.h:
+
</ins><span class="cx"> 2015-01-19 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> LayoutState and subtree layout code should use RenderElement.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (178683 => 178684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-20 00:39:36 UTC (rev 178683)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-20 00:58:42 UTC (rev 178684)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventHandler.h"
</span><span class="cx"> #include "EventNames.h"
</span><del>-#include "FeatureCounter.h"
</del><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "FormState.h"
</span><span class="cx"> #include "FormSubmission.h"
</span><span class="lines">@@ -1373,35 +1372,27 @@
</span><span class="cx">
</span><span class="cx"> static void logNavigation(MainFrame& frame, FrameLoadType type)
</span><span class="cx"> {
</span><del>- const char* featureCounterKey;
</del><span class="cx"> String navigationDescription;
</span><span class="cx"> switch (type) {
</span><span class="cx"> case FrameLoadType::Standard:
</span><del>- featureCounterKey = FeatureCounterNavigationStandardKey;
</del><span class="cx"> navigationDescription = ASCIILiteral("standard");
</span><span class="cx"> break;
</span><span class="cx"> case FrameLoadType::Back:
</span><del>- featureCounterKey = FeatureCounterNavigationBackKey;
</del><span class="cx"> navigationDescription = ASCIILiteral("back");
</span><span class="cx"> break;
</span><span class="cx"> case FrameLoadType::Forward:
</span><del>- featureCounterKey = FeatureCounterNavigationForwardKey;
</del><span class="cx"> navigationDescription = ASCIILiteral("forward");
</span><span class="cx"> break;
</span><span class="cx"> case FrameLoadType::IndexedBackForward:
</span><del>- featureCounterKey = FeatureCounterNavigationIndexedBackForwardKey;
</del><span class="cx"> navigationDescription = ASCIILiteral("indexedBackForward");
</span><span class="cx"> break;
</span><span class="cx"> case FrameLoadType::Reload:
</span><del>- featureCounterKey = FeatureCounterNavigationReloadKey;
</del><span class="cx"> navigationDescription = ASCIILiteral("reload");
</span><span class="cx"> break;
</span><span class="cx"> case FrameLoadType::Same:
</span><del>- featureCounterKey = FeatureCounterNavigationSameKey;
</del><span class="cx"> navigationDescription = ASCIILiteral("same");
</span><span class="cx"> break;
</span><span class="cx"> case FrameLoadType::ReloadFromOrigin:
</span><del>- featureCounterKey = FeatureCounterNavigationReloadFromOriginKey;
</del><span class="cx"> navigationDescription = ASCIILiteral("reloadFromOrigin");
</span><span class="cx"> break;
</span><span class="cx"> case FrameLoadType::Replace:
</span><span class="lines">@@ -1413,8 +1404,6 @@
</span><span class="cx"> if (auto* client = frame.diagnosticLoggingClient())
</span><span class="cx"> client->logDiagnosticMessage(DiagnosticLoggingKeys::navigationKey(), navigationDescription);
</span><span class="cx"> }
</span><del>- // FIXME: Remove once DiagnosticLoggingClient works on iOS.
- FEATURE_COUNTER_INCREMENT_KEY(frame.page(), featureCounterKey);
</del><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></pre></div>
<a id="trunkSourceWebCoreplatformFeatureCounterKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/FeatureCounterKeys.h (178683 => 178684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-20 00:39:36 UTC (rev 178683)
+++ trunk/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-20 00:58:42 UTC (rev 178684)
</span><span class="lines">@@ -74,15 +74,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>-// Navigation types.
-static const char FeatureCounterNavigationStandardKey[] = "com.apple.WebKit.navigation.standard";
-static const char FeatureCounterNavigationBackKey[] = "com.apple.WebKit.navigation.back";
-static const char FeatureCounterNavigationForwardKey[] = "com.apple.WebKit.navigation.forward";
-static const char FeatureCounterNavigationIndexedBackForwardKey[] = "com.apple.WebKit.navigation.indexedBackForward";
-static const char FeatureCounterNavigationReloadKey[] = "com.apple.WebKit.navigation.reload";
-static const char FeatureCounterNavigationSameKey[] = "com.apple.WebKit.navigation.same";
-static const char FeatureCounterNavigationReloadFromOriginKey[] = "com.apple.WebKit.navigation.reloadFromOrigin";
-
</del><span class="cx"> // Resource types.
</span><span class="cx"> static const char FeatureCounterResourceLoadedFontKey[] = "com.apple.WebKit.resource.loaded.font";
</span><span class="cx"> static const char FeatureCounterResourceLoadedImageKey[] = "com.apple.WebKit.resource.loaded.image";
</span></span></pre>
</div>
</div>
</body>
</html>