<!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>[211304] trunk/Source</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/211304">211304</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-01-27 15:11:17 -0800 (Fri, 27 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix remaining bad uses of logDiagnosticMessageWithValue()
https://bugs.webkit.org/show_bug.cgi?id=167526
Reviewed by Alex Christensen.
Source/WebCore:
Drop unused keys, add new ones.
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::networkCacheFailureReasonKey):
(WebCore::DiagnosticLoggingKeys::networkCacheUnusedReasonKey):
(WebCore::DiagnosticLoggingKeys::networkCacheReuseFailureKey):
(WebCore::DiagnosticLoggingKeys::backNavigationDeltaKey):
(WebCore::DiagnosticLoggingKeys::userZoomActionKey):
(WebCore::DiagnosticLoggingKeys::deltaKey): Deleted.
(WebCore::DiagnosticLoggingKeys::backNavigationKey): Deleted.
(WebCore::DiagnosticLoggingKeys::requestKey): Deleted.
(WebCore::DiagnosticLoggingKeys::unusableCachedEntryKey): Deleted.
(WebCore::DiagnosticLoggingKeys::userKey): Deleted.
(WebCore::DiagnosticLoggingKeys::zoomedKey): Deleted.
(WebCore::DiagnosticLoggingKeys::notInCacheKey): Deleted.
* page/DiagnosticLoggingKeys.h:
Source/WebKit2:
Fix remaining bad uses of logDiagnosticMessageWithValue(). It can only
be called with numeric values.
* NetworkProcess/cache/NetworkCacheStatistics.cpp:
(WebKit::NetworkCache::Statistics::recordNotUsingCacheForRequest):
(WebKit::NetworkCache::Statistics::recordRetrievalFailure):
(WebKit::NetworkCache::Statistics::recordRetrievedCachedEntry):
* UIProcess/WebBackForwardList.cpp:
(WebKit::WebBackForwardList::goToItem):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::willStartUserTriggeredZooming):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBackForwardListcpp">trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211303 => 211304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-27 22:39:33 UTC (rev 211303)
+++ trunk/Source/WebCore/ChangeLog 2017-01-27 23:11:17 UTC (rev 211304)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2017-01-27 Chris Dumez <cdumez@apple.com>
+
+ Fix remaining bad uses of logDiagnosticMessageWithValue()
+ https://bugs.webkit.org/show_bug.cgi?id=167526
+
+ Reviewed by Alex Christensen.
+
+ Drop unused keys, add new ones.
+
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::networkCacheFailureReasonKey):
+ (WebCore::DiagnosticLoggingKeys::networkCacheUnusedReasonKey):
+ (WebCore::DiagnosticLoggingKeys::networkCacheReuseFailureKey):
+ (WebCore::DiagnosticLoggingKeys::backNavigationDeltaKey):
+ (WebCore::DiagnosticLoggingKeys::userZoomActionKey):
+ (WebCore::DiagnosticLoggingKeys::deltaKey): Deleted.
+ (WebCore::DiagnosticLoggingKeys::backNavigationKey): Deleted.
+ (WebCore::DiagnosticLoggingKeys::requestKey): Deleted.
+ (WebCore::DiagnosticLoggingKeys::unusableCachedEntryKey): Deleted.
+ (WebCore::DiagnosticLoggingKeys::userKey): Deleted.
+ (WebCore::DiagnosticLoggingKeys::zoomedKey): Deleted.
+ (WebCore::DiagnosticLoggingKeys::notInCacheKey): Deleted.
+ * page/DiagnosticLoggingKeys.h:
+
</ins><span class="cx"> 2017-01-27 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Proclaim that we are considering font-display, rhythmic sizing, and text decoration level 4
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (211303 => 211304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-01-27 22:39:33 UTC (rev 211303)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-01-27 23:11:17 UTC (rev 211304)
</span><span class="lines">@@ -153,6 +153,21 @@
</span><span class="cx"> return ASCIILiteral("networkCache");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::networkCacheFailureReasonKey()
+{
+ return ASCIILiteral("networkCacheFailureReason");
+}
+
+String DiagnosticLoggingKeys::networkCacheUnusedReasonKey()
+{
+ return ASCIILiteral("networkCacheUnusedReason");
+}
+
+String DiagnosticLoggingKeys::networkCacheReuseFailureKey()
+{
+ return ASCIILiteral("networkCacheReuseFailure");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::networkKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("network");
</span><span class="lines">@@ -343,11 +358,6 @@
</span><span class="cx"> return ASCIILiteral("createSharedBufferFailed");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DiagnosticLoggingKeys::deltaKey()
-{
- return ASCIILiteral("delta");
-}
-
</del><span class="cx"> String DiagnosticLoggingKeys::activeInForegroundTabKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("activeInForegroundTab");
</span><span class="lines">@@ -368,9 +378,9 @@
</span><span class="cx"> return ASCIILiteral("audio");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DiagnosticLoggingKeys::backNavigationKey()
</del><ins>+String DiagnosticLoggingKeys::backNavigationDeltaKey()
</ins><span class="cx"> {
</span><del>- return ASCIILiteral("backNavigation");
</del><ins>+ return ASCIILiteral("backNavigationDelta");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DiagnosticLoggingKeys::canCacheKey()
</span><span class="lines">@@ -433,11 +443,6 @@
</span><span class="cx"> return ASCIILiteral("replace");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DiagnosticLoggingKeys::requestKey()
-{
- return ASCIILiteral("request");
-}
-
</del><span class="cx"> String DiagnosticLoggingKeys::retrievalRequestKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("retrievalRequest");
</span><span class="lines">@@ -538,11 +543,6 @@
</span><span class="cx"> return ASCIILiteral("unsuspendableDOMObject");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DiagnosticLoggingKeys::unusableCachedEntryKey()
-{
- return ASCIILiteral("unusableCachedEntry");
-}
-
</del><span class="cx"> String DiagnosticLoggingKeys::unusedKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("unused");
</span><span class="lines">@@ -588,9 +588,9 @@
</span><span class="cx"> return ASCIILiteral("used");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DiagnosticLoggingKeys::userKey()
</del><ins>+String DiagnosticLoggingKeys::userZoomActionKey()
</ins><span class="cx"> {
</span><del>- return ASCIILiteral("user");
</del><ins>+ return ASCIILiteral("userZoomAction");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DiagnosticLoggingKeys::varyingHeaderMismatchKey()
</span><span class="lines">@@ -633,11 +633,6 @@
</span><span class="cx"> return ASCIILiteral("yes");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DiagnosticLoggingKeys::zoomedKey()
-{
- return ASCIILiteral("zoomed");
-}
-
</del><span class="cx"> String DiagnosticLoggingKeys::expiredKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("expired");
</span><span class="lines">@@ -678,11 +673,6 @@
</span><span class="cx"> return ASCIILiteral("notHTTPFamily");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DiagnosticLoggingKeys::notInCacheKey()
-{
- return ASCIILiteral("notInCache");
-}
-
</del><span class="cx"> String WebCore::DiagnosticLoggingKeys::webGLStateKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("webGLState");
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (211303 => 211304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-01-27 22:39:33 UTC (rev 211303)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-01-27 23:11:17 UTC (rev 211304)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> WEBCORE_EXPORT static String activeInBackgroundTabOnlyKey();
</span><span class="cx"> static String applicationCacheKey();
</span><span class="cx"> static String audioKey();
</span><del>- WEBCORE_EXPORT static String backNavigationKey();
</del><ins>+ WEBCORE_EXPORT static String backNavigationDeltaKey();
</ins><span class="cx"> WEBCORE_EXPORT static String cacheControlNoStoreKey();
</span><span class="cx"> static String cachedResourceRevalidationKey();
</span><span class="cx"> static String cachedResourceRevalidationReasonKey();
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> static String cannotSuspendActiveDOMObjectsKey();
</span><span class="cx"> WEBCORE_EXPORT static String cpuUsageKey();
</span><span class="cx"> WEBCORE_EXPORT static String createSharedBufferFailedKey();
</span><del>- WEBCORE_EXPORT static String deltaKey();
</del><span class="cx"> static String deniedByClientKey();
</span><span class="cx"> static String deviceMotionKey();
</span><span class="cx"> static String deviceOrientationKey();
</span><span class="lines">@@ -83,6 +82,9 @@
</span><span class="cx"> static String navigationKey();
</span><span class="cx"> WEBCORE_EXPORT static String needsRevalidationKey();
</span><span class="cx"> WEBCORE_EXPORT static String networkCacheKey();
</span><ins>+ WEBCORE_EXPORT static String networkCacheFailureReasonKey();
+ WEBCORE_EXPORT static String networkCacheUnusedReasonKey();
+ WEBCORE_EXPORT static String networkCacheReuseFailureKey();
</ins><span class="cx"> static String networkKey();
</span><span class="cx"> WEBCORE_EXPORT static String networkProcessCrashedKey();
</span><span class="cx"> WEBCORE_EXPORT static String neverSeenBeforeKey();
</span><span class="lines">@@ -94,7 +96,6 @@
</span><span class="cx"> static String noStoreKey();
</span><span class="cx"> WEBCORE_EXPORT static String nonVisibleStateKey();
</span><span class="cx"> WEBCORE_EXPORT static String notHTTPFamilyKey();
</span><del>- WEBCORE_EXPORT static String notInCacheKey();
</del><span class="cx"> static String notInMemoryCacheKey();
</span><span class="cx"> WEBCORE_EXPORT static String otherKey();
</span><span class="cx"> static String pageCacheKey();
</span><span class="lines">@@ -122,7 +123,6 @@
</span><span class="cx"> static String reloadFromOriginKey();
</span><span class="cx"> static String reloadKey();
</span><span class="cx"> static String replaceKey();
</span><del>- WEBCORE_EXPORT static String requestKey();
</del><span class="cx"> static String resourceLoadedKey();
</span><span class="cx"> static String resourceResponseSourceKey();
</span><span class="cx"> WEBCORE_EXPORT static String retrievalKey();
</span><span class="lines">@@ -142,7 +142,6 @@
</span><span class="cx"> WEBCORE_EXPORT static String unlikelyToReuseKey();
</span><span class="cx"> WEBCORE_EXPORT static String unsupportedHTTPMethodKey();
</span><span class="cx"> static String unsuspendableDOMObjectKey();
</span><del>- WEBCORE_EXPORT static String unusableCachedEntryKey();
</del><span class="cx"> WEBCORE_EXPORT static String unusedKey();
</span><span class="cx"> static String unusedReasonCredentialSettingsKey();
</span><span class="cx"> static String unusedReasonErrorKey();
</span><span class="lines">@@ -152,7 +151,7 @@
</span><span class="cx"> static String unusedReasonReloadKey();
</span><span class="cx"> static String unusedReasonTypeMismatchKey();
</span><span class="cx"> static String usedKey();
</span><del>- WEBCORE_EXPORT static String userKey();
</del><ins>+ WEBCORE_EXPORT static String userZoomActionKey();
</ins><span class="cx"> WEBCORE_EXPORT static String varyingHeaderMismatchKey();
</span><span class="cx"> static String videoKey();
</span><span class="cx"> WEBCORE_EXPORT static String visibleNonActiveStateKey();
</span><span class="lines">@@ -162,7 +161,6 @@
</span><span class="cx"> WEBCORE_EXPORT static String webGLStateKey();
</span><span class="cx"> WEBCORE_EXPORT static String webViewKey();
</span><span class="cx"> static String yesKey();
</span><del>- WEBCORE_EXPORT static String zoomedKey();
</del><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static String memoryUsageToDiagnosticLoggingKey(uint64_t memoryUsage);
</span><span class="cx"> WEBCORE_EXPORT static String foregroundCPUUsageToDiagnosticLoggingKey(double cpuUsage);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211303 => 211304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-27 22:39:33 UTC (rev 211303)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-27 23:11:17 UTC (rev 211304)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2017-01-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Fix remaining bad uses of logDiagnosticMessageWithValue()
+ https://bugs.webkit.org/show_bug.cgi?id=167526
+
+ Reviewed by Alex Christensen.
+
+ Fix remaining bad uses of logDiagnosticMessageWithValue(). It can only
+ be called with numeric values.
+
+ * NetworkProcess/cache/NetworkCacheStatistics.cpp:
+ (WebKit::NetworkCache::Statistics::recordNotUsingCacheForRequest):
+ (WebKit::NetworkCache::Statistics::recordRetrievalFailure):
+ (WebKit::NetworkCache::Statistics::recordRetrievedCachedEntry):
+ * UIProcess/WebBackForwardList.cpp:
+ (WebKit::WebBackForwardList::goToItem):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::willStartUserTriggeredZooming):
+
+2017-01-27 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Round CPU Usage diagnostic logging to 2 significant digits
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=167515
</span><span class="cx"> <rdar://problem/30236297>
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp (211303 => 211304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2017-01-27 22:39:33 UTC (rev 211303)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2017-01-27 23:11:17 UTC (rev 211304)
</span><span class="lines">@@ -220,9 +220,9 @@
</span><span class="cx"> if (wasEverRequested) {
</span><span class="cx"> String diagnosticKey = retrieveDecisionToDiagnosticKey(retrieveDecision);
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) webPageID %" PRIu64 ": %s was previously requested but we are not using the cache, reason: %s", webPageID, requestURL.string().ascii().data(), diagnosticKey.utf8().data());
</span><del>- NetworkProcess::singleton().logDiagnosticMessageWithValue(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::unusedKey(), diagnosticKey, WebCore::ShouldSample::Yes);
</del><ins>+ NetworkProcess::singleton().logDiagnosticMessage(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheUnusedReasonKey(), diagnosticKey, WebCore::ShouldSample::Yes);
</ins><span class="cx"> } else {
</span><del>- NetworkProcess::singleton().logDiagnosticMessageWithValue(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::requestKey(), WebCore::DiagnosticLoggingKeys::neverSeenBeforeKey(), WebCore::ShouldSample::Yes);
</del><ins>+ NetworkProcess::singleton().logDiagnosticMessage(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheUnusedReasonKey(), WebCore::DiagnosticLoggingKeys::neverSeenBeforeKey(), WebCore::ShouldSample::Yes);
</ins><span class="cx"> markAsRequested(hash);
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -260,9 +260,9 @@
</span><span class="cx"> if (wasPreviouslyRequested) {
</span><span class="cx"> String diagnosticKey = storeDecisionToDiagnosticKey(storeDecision.value());
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) webPageID %" PRIu64 ": %s was previously request but is not in the cache, reason: %s", webPageID, requestURL.string().ascii().data(), diagnosticKey.utf8().data());
</span><del>- NetworkProcess::singleton().logDiagnosticMessageWithValue(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::notInCacheKey(), diagnosticKey, WebCore::ShouldSample::Yes);
</del><ins>+ NetworkProcess::singleton().logDiagnosticMessage(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheFailureReasonKey(), diagnosticKey, WebCore::ShouldSample::Yes);
</ins><span class="cx"> } else {
</span><del>- NetworkProcess::singleton().logDiagnosticMessageWithValue(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::requestKey(), WebCore::DiagnosticLoggingKeys::neverSeenBeforeKey(), WebCore::ShouldSample::Yes);
</del><ins>+ NetworkProcess::singleton().logDiagnosticMessage(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheFailureReasonKey(), WebCore::DiagnosticLoggingKeys::neverSeenBeforeKey(), WebCore::ShouldSample::Yes);
</ins><span class="cx"> markAsRequested(hash);
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -297,13 +297,13 @@
</span><span class="cx">
</span><span class="cx"> if (decision == UseDecision::Validate) {
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) webPageID %" PRIu64 ": %s is in the cache but needs revalidation", webPageID, requestURL.string().ascii().data());
</span><del>- NetworkProcess::singleton().logDiagnosticMessageWithValue(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::retrievalKey(), WebCore::DiagnosticLoggingKeys::needsRevalidationKey(), WebCore::ShouldSample::Yes);
</del><ins>+ NetworkProcess::singleton().logDiagnosticMessage(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::needsRevalidationKey(), WebCore::ShouldSample::Yes);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String diagnosticKey = cachedEntryReuseFailureToDiagnosticKey(decision);
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) webPageID %" PRIu64 ": %s is in the cache but wasn't used, reason: %s", webPageID, requestURL.string().ascii().data(), diagnosticKey.utf8().data());
</span><del>- NetworkProcess::singleton().logDiagnosticMessageWithValue(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::unusableCachedEntryKey(), diagnosticKey, WebCore::ShouldSample::Yes);
</del><ins>+ NetworkProcess::singleton().logDiagnosticMessage(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheReuseFailureKey(), diagnosticKey, WebCore::ShouldSample::Yes);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Statistics::recordRevalidationSuccess(uint64_t webPageID, const Key& key, const WebCore::ResourceRequest& request)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (211303 => 211304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2017-01-27 22:39:33 UTC (rev 211303)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2017-01-27 23:11:17 UTC (rev 211304)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> if (targetIndex < m_currentIndex) {
</span><span class="cx"> unsigned delta = m_entries.size() - targetIndex - 1;
</span><span class="cx"> String deltaValue = delta > 10 ? ASCIILiteral("over10") : String::number(delta);
</span><del>- m_page->logDiagnosticMessageWithValue(WebCore::DiagnosticLoggingKeys::backNavigationKey(), WebCore::DiagnosticLoggingKeys::deltaKey(), deltaValue, false /* shouldSample */);
</del><ins>+ m_page->logDiagnosticMessage(WebCore::DiagnosticLoggingKeys::backNavigationDeltaKey(), deltaValue, false /* shouldSample */);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If we're going to an item different from the current item, ask the client if the current
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (211303 => 211304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-01-27 22:39:33 UTC (rev 211303)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-01-27 23:11:17 UTC (rev 211304)
</span><span class="lines">@@ -3127,7 +3127,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::willStartUserTriggeredZooming()
</span><span class="cx"> {
</span><del>- m_page->diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::webViewKey(), DiagnosticLoggingKeys::userKey(), DiagnosticLoggingKeys::zoomedKey(), ShouldSample::No);
</del><ins>+ m_page->diagnosticLoggingClient().logDiagnosticMessage(DiagnosticLoggingKeys::webViewKey(), DiagnosticLoggingKeys::userZoomActionKey(), ShouldSample::No);
</ins><span class="cx"> m_userHasChangedPageScaleFactor = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>