<!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>[211376] 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/211376">211376</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-01-30 10:45:21 -0800 (Mon, 30 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update DiagnosticLoggingClient::logDiagnosticMessageWithValue() to take in the value as a double
https://bugs.webkit.org/show_bug.cgi?id=167536
Reviewed by Darin Adler.
Update DiagnosticLoggingClient::logDiagnosticMessageWithValue() to take in the value as a double
instead of a string. The value needs to be numeric and the current API is error-prone.
Source/WebCore:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaPlayerEngineFailedToLoad):
* loader/EmptyClients.cpp:
* page/DiagnosticLoggingClient.h:
Source/WebKit2:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::logDiagnosticMessage):
(WebKit::NetworkProcess::logDiagnosticMessageWithResult):
(WebKit::NetworkProcess::logDiagnosticMessageWithValue):
* NetworkProcess/NetworkProcess.h:
* Scripts/webkit/messages.py:
(headers_for_type):
* Shared/WebCoreArgumentCoders.h:
* UIProcess/HighPerformanceGraphicsUsageSampler.cpp:
(WebKit::HighPerformanceGraphicsUsageSampler::timerFired):
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::logDiagnosticMessage):
(WebKit::NetworkProcessProxy::logDiagnosticMessageWithResult):
(WebKit::NetworkProcessProxy::logDiagnosticMessageWithValue):
* UIProcess/Network/NetworkProcessProxy.h:
* UIProcess/Network/NetworkProcessProxy.messages.in:
* UIProcess/PerActivityStateCPUUsageSampler.cpp:
(WebKit::PerActivityStateCPUUsageSampler::loggingTimerFired):
* UIProcess/WebBackForwardList.cpp:
(WebKit::WebBackForwardList::goToItem):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::logDiagnosticMessage):
(WebKit::WebPageProxy::logDiagnosticMessageWithResult):
(WebKit::WebPageProxy::logDiagnosticMessageWithValue):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp:
(WebKit::WebDiagnosticLoggingClient::logDiagnosticMessage):
(WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithResult):
(WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithValue):
* WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientscpp">trunk/Source/WebCore/loader/EmptyClients.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingClienth">trunk/Source/WebCore/page/DiagnosticLoggingClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkitmessagespy">trunk/Source/WebKit2/Scripts/webkit/messages.py</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessHighPerformanceGraphicsUsageSamplercpp">trunk/Source/WebKit2/UIProcess/HighPerformanceGraphicsUsageSampler.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxymessagesin">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPerActivityStateCPUUsageSamplercpp">trunk/Source/WebKit2/UIProcess/PerActivityStateCPUUsageSampler.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebBackForwardListcpp">trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDiagnosticLoggingClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDiagnosticLoggingClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebCore/ChangeLog 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-01-30 Chris Dumez <cdumez@apple.com>
+
+ Update DiagnosticLoggingClient::logDiagnosticMessageWithValue() to take in the value as a double
+ https://bugs.webkit.org/show_bug.cgi?id=167536
+
+ Reviewed by Darin Adler.
+
+ Update DiagnosticLoggingClient::logDiagnosticMessageWithValue() to take in the value as a double
+ instead of a string. The value needs to be numeric and the current API is error-prone.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaPlayerEngineFailedToLoad):
+ * loader/EmptyClients.cpp:
+ * page/DiagnosticLoggingClient.h:
+
</ins><span class="cx"> 2017-01-30 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rollout r211235 Pointer lock events should be delivered directly to the target element.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -6472,7 +6472,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (auto* page = document().page())
</span><del>- page->diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::engineFailedToLoadKey(), m_player->engineDescription(), String::number(m_player->platformErrorCode()), ShouldSample::No);
</del><ins>+ page->diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::engineFailedToLoadKey(), m_player->engineDescription(), m_player->platformErrorCode(), 4, ShouldSample::No);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double HTMLMediaElement::mediaPlayerRequestedPlaybackRate() const
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.cpp 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> class EmptyDiagnosticLoggingClient final : public DiagnosticLoggingClient {
</span><span class="cx"> void logDiagnosticMessage(const String&, const String&, ShouldSample) final { }
</span><span class="cx"> void logDiagnosticMessageWithResult(const String&, const String&, DiagnosticLoggingResultType, ShouldSample) final { }
</span><del>- void logDiagnosticMessageWithValue(const String&, const String&, const String&, ShouldSample) final { }
</del><ins>+ void logDiagnosticMessageWithValue(const String&, const String&, double, unsigned, ShouldSample) final { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingClient.h (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingClient.h 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebCore/page/DiagnosticLoggingClient.h 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -39,8 +39,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual void logDiagnosticMessage(const String& message, const String& description, ShouldSample) = 0;
</span><span class="cx"> virtual void logDiagnosticMessageWithResult(const String& message, const String& description, DiagnosticLoggingResultType, ShouldSample) = 0;
</span><del>- // FIXME: rename this to logDiagnosticMessageWithNumericValue().
- virtual void logDiagnosticMessageWithValue(const String& message, const String& description, const String& value, ShouldSample) = 0;
</del><ins>+ virtual void logDiagnosticMessageWithValue(const String& message, const String& description, double value, unsigned significantFigures, ShouldSample) = 0;
</ins><span class="cx">
</span><span class="cx"> static bool shouldLogAfterSampling(ShouldSample);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2017-01-30 Chris Dumez <cdumez@apple.com>
+
+ Update DiagnosticLoggingClient::logDiagnosticMessageWithValue() to take in the value as a double
+ https://bugs.webkit.org/show_bug.cgi?id=167536
+
+ Reviewed by Darin Adler.
+
+ Update DiagnosticLoggingClient::logDiagnosticMessageWithValue() to take in the value as a double
+ instead of a string. The value needs to be numeric and the current API is error-prone.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::logDiagnosticMessage):
+ (WebKit::NetworkProcess::logDiagnosticMessageWithResult):
+ (WebKit::NetworkProcess::logDiagnosticMessageWithValue):
+ * NetworkProcess/NetworkProcess.h:
+ * Scripts/webkit/messages.py:
+ (headers_for_type):
+ * Shared/WebCoreArgumentCoders.h:
+ * UIProcess/HighPerformanceGraphicsUsageSampler.cpp:
+ (WebKit::HighPerformanceGraphicsUsageSampler::timerFired):
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::logDiagnosticMessage):
+ (WebKit::NetworkProcessProxy::logDiagnosticMessageWithResult):
+ (WebKit::NetworkProcessProxy::logDiagnosticMessageWithValue):
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/Network/NetworkProcessProxy.messages.in:
+ * UIProcess/PerActivityStateCPUUsageSampler.cpp:
+ (WebKit::PerActivityStateCPUUsageSampler::loggingTimerFired):
+ * UIProcess/WebBackForwardList.cpp:
+ (WebKit::WebBackForwardList::goToItem):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::logDiagnosticMessage):
+ (WebKit::WebPageProxy::logDiagnosticMessageWithResult):
+ (WebKit::WebPageProxy::logDiagnosticMessageWithValue):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp:
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessage):
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithResult):
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithValue):
+ * WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h:
+
</ins><span class="cx"> 2017-01-30 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Mac][cmake] Fix the build after r211354.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -585,7 +585,7 @@
</span><span class="cx"> if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- parentProcessConnection()->send(Messages::NetworkProcessProxy::LogSampledDiagnosticMessage(webPageID, message, description), 0);
</del><ins>+ parentProcessConnection()->send(Messages::NetworkProcessProxy::LogDiagnosticMessage(webPageID, message, description, ShouldSample::No), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::logDiagnosticMessageWithResult(uint64_t webPageID, const String& message, const String& description, DiagnosticLoggingResultType result, ShouldSample shouldSample)
</span><span class="lines">@@ -593,15 +593,15 @@
</span><span class="cx"> if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- parentProcessConnection()->send(Messages::NetworkProcessProxy::LogSampledDiagnosticMessageWithResult(webPageID, message, description, result), 0);
</del><ins>+ parentProcessConnection()->send(Messages::NetworkProcessProxy::LogDiagnosticMessageWithResult(webPageID, message, description, result, ShouldSample::No), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::logDiagnosticMessageWithValue(uint64_t webPageID, const String& message, const String& description, const String& value, ShouldSample shouldSample)
</del><ins>+void NetworkProcess::logDiagnosticMessageWithValue(uint64_t webPageID, const String& message, const String& description, double value, unsigned significantFigures, ShouldSample shouldSample)
</ins><span class="cx"> {
</span><span class="cx"> if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- parentProcessConnection()->send(Messages::NetworkProcessProxy::LogSampledDiagnosticMessageWithValue(webPageID, message, description, value), 0);
</del><ins>+ parentProcessConnection()->send(Messages::NetworkProcessProxy::LogDiagnosticMessageWithValue(webPageID, message, description, value, significantFigures, ShouldSample::No), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::terminate()
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> // Diagnostic messages logging.
</span><span class="cx"> void logDiagnosticMessage(uint64_t webPageID, const String& message, const String& description, WebCore::ShouldSample);
</span><span class="cx"> void logDiagnosticMessageWithResult(uint64_t webPageID, const String& message, const String& description, WebCore::DiagnosticLoggingResultType, WebCore::ShouldSample);
</span><del>- void logDiagnosticMessageWithValue(uint64_t webPageID, const String& message, const String& description, const String& value, WebCore::ShouldSample);
</del><ins>+ void logDiagnosticMessageWithValue(uint64_t webPageID, const String& message, const String& description, double value, unsigned significantFigures, WebCore::ShouldSample);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> RetainPtr<CFDataRef> sourceApplicationAuditData() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkitmessagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/messages.py (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit/messages.py 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/Scripts/webkit/messages.py 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -360,6 +360,7 @@
</span><span class="cx"> 'WebCore::PasteboardWebContent': ['<WebCore/Pasteboard.h>'],
</span><span class="cx"> 'WebCore::PluginInfo': ['<WebCore/PluginData.h>'],
</span><span class="cx"> 'WebCore::RecentSearch': ['<WebCore/SearchPopupMenu.h>'],
</span><ins>+ 'WebCore::ShouldSample': ['<WebCore/DiagnosticLoggingClient.h>'],
</ins><span class="cx"> 'WebCore::TextCheckingRequestData': ['<WebCore/TextChecking.h>'],
</span><span class="cx"> 'WebCore::TextCheckingResult': ['<WebCore/TextCheckerClient.h>'],
</span><span class="cx"> 'WebCore::TextIndicatorData': ['<WebCore/TextIndicator.h>'],
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ArgumentCoders.h"
</span><span class="cx"> #include <WebCore/ColorSpace.h>
</span><ins>+#include <WebCore/DiagnosticLoggingClient.h>
</ins><span class="cx"> #include <WebCore/FrameLoaderTypes.h>
</span><span class="cx"> #include <WebCore/IndexedDB.h>
</span><span class="cx"> #include <WebCore/PaymentHeaders.h>
</span><span class="lines">@@ -644,6 +645,14 @@
</span><span class="cx"> >;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<> struct EnumTraits<WebCore::ShouldSample> {
+ using values = EnumValues<
+ WebCore::ShouldSample,
+ WebCore::ShouldSample::No,
+ WebCore::ShouldSample::Yes
+ >;
+};
+
</ins><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> template<> struct EnumTraits<WebCore::IndexedDB::GetAllType> {
</span><span class="cx"> using values = EnumValues<
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessHighPerformanceGraphicsUsageSamplercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/HighPerformanceGraphicsUsageSampler.cpp (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/HighPerformanceGraphicsUsageSampler.cpp 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/UIProcess/HighPerformanceGraphicsUsageSampler.cpp 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> else if (isUsingHighPerformanceWebGL)
</span><span class="cx"> state = DiagnosticLoggingKeys::activeInBackgroundTabOnlyKey();
</span><span class="cx">
</span><del>- firstPage->logDiagnosticMessage(DiagnosticLoggingKeys::webGLStateKey(), state, false);
</del><ins>+ firstPage->logDiagnosticMessage(DiagnosticLoggingKeys::webGLStateKey(), state, ShouldSample::No);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcessProxy::logSampledDiagnosticMessage(uint64_t pageID, const String& message, const String& description)
</del><ins>+void NetworkProcessProxy::logDiagnosticMessage(uint64_t pageID, const String& message, const String& description, WebCore::ShouldSample shouldSample)
</ins><span class="cx"> {
</span><span class="cx"> WebPageProxy* page = WebProcessProxy::webPage(pageID);
</span><span class="cx"> // FIXME: We do this null-check because by the time the decision to log is made, the page may be gone. We should refactor to avoid this,
</span><span class="lines">@@ -324,10 +324,10 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- page->logSampledDiagnosticMessage(message, description);
</del><ins>+ page->logDiagnosticMessage(message, description, shouldSample);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcessProxy::logSampledDiagnosticMessageWithResult(uint64_t pageID, const String& message, const String& description, uint32_t result)
</del><ins>+void NetworkProcessProxy::logDiagnosticMessageWithResult(uint64_t pageID, const String& message, const String& description, uint32_t result, WebCore::ShouldSample shouldSample)
</ins><span class="cx"> {
</span><span class="cx"> WebPageProxy* page = WebProcessProxy::webPage(pageID);
</span><span class="cx"> // FIXME: We do this null-check because by the time the decision to log is made, the page may be gone. We should refactor to avoid this,
</span><span class="lines">@@ -335,10 +335,10 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- page->logSampledDiagnosticMessageWithResult(message, description, result);
</del><ins>+ page->logDiagnosticMessageWithResult(message, description, result, shouldSample);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcessProxy::logSampledDiagnosticMessageWithValue(uint64_t pageID, const String& message, const String& description, const String& value)
</del><ins>+void NetworkProcessProxy::logDiagnosticMessageWithValue(uint64_t pageID, const String& message, const String& description, double value, unsigned significantFigures, WebCore::ShouldSample shouldSample)
</ins><span class="cx"> {
</span><span class="cx"> WebPageProxy* page = WebProcessProxy::webPage(pageID);
</span><span class="cx"> // FIXME: We do this null-check because by the time the decision to log is made, the page may be gone. We should refactor to avoid this,
</span><span class="lines">@@ -346,7 +346,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- page->logSampledDiagnosticMessageWithValue(message, description, value);
</del><ins>+ page->logDiagnosticMessageWithValue(message, description, value, significantFigures, shouldSample);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> class AuthenticationChallenge;
</span><span class="cx"> class ProtectionSpace;
</span><span class="cx"> class ResourceRequest;
</span><ins>+enum class ShouldSample;
</ins><span class="cx"> class SecurityOrigin;
</span><span class="cx"> struct SecurityOriginData;
</span><span class="cx"> class SessionID;
</span><span class="lines">@@ -109,9 +110,9 @@
</span><span class="cx"> void didDeleteWebsiteData(uint64_t callbackID);
</span><span class="cx"> void didDeleteWebsiteDataForOrigins(uint64_t callbackID);
</span><span class="cx"> void grantSandboxExtensionsToDatabaseProcessForBlobs(uint64_t requestID, const Vector<String>& paths);
</span><del>- void logSampledDiagnosticMessage(uint64_t pageID, const String& message, const String& description);
- void logSampledDiagnosticMessageWithResult(uint64_t pageID, const String& message, const String& description, uint32_t result);
- void logSampledDiagnosticMessageWithValue(uint64_t pageID, const String& message, const String& description, const String& value);
</del><ins>+ void logDiagnosticMessage(uint64_t pageID, const String& message, const String& description, WebCore::ShouldSample);
+ void logDiagnosticMessageWithResult(uint64_t pageID, const String& message, const String& description, uint32_t result, WebCore::ShouldSample);
+ void logDiagnosticMessageWithValue(uint64_t pageID, const String& message, const String& description, double value, unsigned significantFigures, WebCore::ShouldSample);
</ins><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><span class="cx"> void canAuthenticateAgainstProtectionSpace(uint64_t loaderID, uint64_t pageID, uint64_t frameID, const WebCore::ProtectionSpace&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx"> SetIsHoldingLockedFiles(bool isHoldingLockedFiles)
</span><span class="cx">
</span><span class="cx"> # Diagnostic messages logging
</span><del>- LogSampledDiagnosticMessage(uint64_t pageID, String message, String description)
- LogSampledDiagnosticMessageWithResult(uint64_t pageID, String message, String description, uint32_t result)
- LogSampledDiagnosticMessageWithValue(uint64_t pageID, String message, String description, String value)
</del><ins>+ LogDiagnosticMessage(uint64_t pageID, String message, String description, enum WebCore::ShouldSample shouldSample)
+ LogDiagnosticMessageWithResult(uint64_t pageID, String message, String description, uint32_t result, enum WebCore::ShouldSample shouldSample)
+ LogDiagnosticMessageWithValue(uint64_t pageID, String message, String description, double value, unsigned significantFigures, enum WebCore::ShouldSample shouldSample)
</ins><span class="cx">
</span><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><span class="cx"> CanAuthenticateAgainstProtectionSpace(uint64_t loaderID, uint64_t pageID, uint64_t frameID, WebCore::ProtectionSpace protectionSpace)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPerActivityStateCPUUsageSamplercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PerActivityStateCPUUsageSampler.cpp (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PerActivityStateCPUUsageSampler.cpp 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/UIProcess/PerActivityStateCPUUsageSampler.cpp 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -71,14 +71,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String toStringRoundingSignificantFigures(double value, unsigned significantFigures)
-{
- DecimalNumber decimal(value, RoundingSignificantFigures, significantFigures);
- NumberToLStringBuffer buffer;
- unsigned length = decimal.toStringDecimal(buffer, WTF::NumberToStringBufferLength);
- return String(buffer, length);
-}
-
</del><span class="cx"> void PerActivityStateCPUUsageSampler::loggingTimerFired()
</span><span class="cx"> {
</span><span class="cx"> auto* page = pageForLogging();
</span><span class="lines">@@ -93,7 +85,7 @@
</span><span class="cx"> for (auto& pair : m_cpuTimeInActivityState) {
</span><span class="cx"> double cpuUsage = static_cast<double>(pair.value * 100.) / cpuTimeDelta;
</span><span class="cx"> String activityStateKey = loggingKeyForActivityState(pair.key);
</span><del>- page->logDiagnosticMessageWithValue(DiagnosticLoggingKeys::cpuUsageKey(), activityStateKey, toStringRoundingSignificantFigures(cpuUsage, 2), false);
</del><ins>+ page->logDiagnosticMessageWithValue(DiagnosticLoggingKeys::cpuUsageKey(), activityStateKey, cpuUsage, 2, ShouldSample::No);
</ins><span class="cx"> RELEASE_LOG(PerformanceLogging, "WebContent processes used %.1f%% CPU in %s state", cpuUsage, activityStateKey.utf8().data());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -29,10 +29,13 @@
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "SessionState.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><ins>+#include <WebCore/DiagnosticLoggingClient.h>
</ins><span class="cx"> #include <WebCore/DiagnosticLoggingKeys.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+using namespace WebCore;
+
</ins><span class="cx"> // FIXME: Make this static once WebBackForwardListCF.cpp is no longer using it.
</span><span class="cx"> uint64_t generateWebBackForwardItemID();
</span><span class="cx">
</span><span class="lines">@@ -179,7 +182,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->logDiagnosticMessage(WebCore::DiagnosticLoggingKeys::backNavigationDeltaKey(), deltaValue, false /* shouldSample */);
</del><ins>+ m_page->logDiagnosticMessage(WebCore::DiagnosticLoggingKeys::backNavigationDeltaKey(), deltaValue, ShouldSample::No);
</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="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -5168,45 +5168,30 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebPageProxy::logDiagnosticMessage(const String& message, const String& description, bool shouldSample)
</del><ins>+void WebPageProxy::logDiagnosticMessage(const String& message, const String& description, WebCore::ShouldSample shouldSample)
</ins><span class="cx"> {
</span><del>- if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample ? ShouldSample::Yes : ShouldSample::No))
</del><ins>+ if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- logSampledDiagnosticMessage(message, description);
</del><ins>+ m_diagnosticLoggingClient->logDiagnosticMessage(this, message, description);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::logDiagnosticMessageWithResult(const String& message, const String& description, uint32_t result, bool shouldSample)
</del><ins>+void WebPageProxy::logDiagnosticMessageWithResult(const String& message, const String& description, uint32_t result, WebCore::ShouldSample shouldSample)
</ins><span class="cx"> {
</span><del>- if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample ? ShouldSample::Yes : ShouldSample::No))
</del><ins>+ if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- logSampledDiagnosticMessageWithResult(message, description, static_cast<WebCore::DiagnosticLoggingResultType>(result));
</del><ins>+ m_diagnosticLoggingClient->logDiagnosticMessageWithResult(this, message, description, static_cast<WebCore::DiagnosticLoggingResultType>(result));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::logDiagnosticMessageWithValue(const String& message, const String& description, const String& value, bool shouldSample)
</del><ins>+void WebPageProxy::logDiagnosticMessageWithValue(const String& message, const String& description, double value, unsigned significantFigures, ShouldSample shouldSample)
</ins><span class="cx"> {
</span><del>- if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample ? ShouldSample::Yes : ShouldSample::No))
</del><ins>+ if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- logSampledDiagnosticMessageWithValue(message, description, value);
</del><ins>+ m_diagnosticLoggingClient->logDiagnosticMessageWithValue(this, message, description, String::number(value, significantFigures));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::logSampledDiagnosticMessage(const String& message, const String& description)
-{
- m_diagnosticLoggingClient->logDiagnosticMessage(this, message, description);
-}
-
-void WebPageProxy::logSampledDiagnosticMessageWithResult(const String& message, const String& description, uint32_t result)
-{
- m_diagnosticLoggingClient->logDiagnosticMessageWithResult(this, message, description, static_cast<WebCore::DiagnosticLoggingResultType>(result));
-}
-
-void WebPageProxy::logSampledDiagnosticMessageWithValue(const String& message, const String& description, const String& value)
-{
- m_diagnosticLoggingClient->logDiagnosticMessageWithValue(this, message, description, value);
-}
-
</del><span class="cx"> void WebPageProxy::rectForCharacterRangeCallback(const IntRect& rect, const EditingRange& actualRange, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> MESSAGE_CHECK(actualRange.isValid());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> class SharedBuffer;
</span><span class="cx"> class TextIndicator;
</span><span class="cx"> class ValidationBubble;
</span><del>-enum class HasInsecureContent;
</del><ins>+
</ins><span class="cx"> struct DictionaryPopupInfo;
</span><span class="cx"> struct ExceptionDetails;
</span><span class="cx"> struct FileChooserSettings;
</span><span class="lines">@@ -166,6 +166,9 @@
</span><span class="cx"> struct TextCheckingResult;
</span><span class="cx"> struct ViewportAttributes;
</span><span class="cx"> struct WindowFeatures;
</span><ins>+
+enum class HasInsecureContent;
+enum class ShouldSample;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="lines">@@ -1123,12 +1126,9 @@
</span><span class="cx"> void setShouldDispatchFakeMouseMoveEvents(bool);
</span><span class="cx">
</span><span class="cx"> // Diagnostic messages logging.
</span><del>- void logDiagnosticMessage(const String& message, const String& description, bool shouldSample);
- void logDiagnosticMessageWithResult(const String& message, const String& description, uint32_t result, bool shouldSample);
- void logDiagnosticMessageWithValue(const String& message, const String& description, const String& value, bool shouldSample);
- void logSampledDiagnosticMessage(const String& message, const String& description);
- void logSampledDiagnosticMessageWithResult(const String& message, const String& description, uint32_t result);
- void logSampledDiagnosticMessageWithValue(const String& message, const String& description, const String& value);
</del><ins>+ void logDiagnosticMessage(const String& message, const String& description, WebCore::ShouldSample);
+ void logDiagnosticMessageWithResult(const String& message, const String& description, uint32_t result, WebCore::ShouldSample);
+ void logDiagnosticMessageWithValue(const String& message, const String& description, double value, unsigned significantFigures, WebCore::ShouldSample);
</ins><span class="cx">
</span><span class="cx"> // Form validation messages.
</span><span class="cx"> void showValidationMessage(const WebCore::IntRect& anchorClientRect, const String& message);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -235,9 +235,9 @@
</span><span class="cx"> ExecuteUndoRedo(uint32_t action) -> (bool result)
</span><span class="cx">
</span><span class="cx"> # Diagnostic messages logging
</span><del>- LogSampledDiagnosticMessage(String message, String description)
- LogSampledDiagnosticMessageWithResult(String message, String description, uint32_t result)
- LogSampledDiagnosticMessageWithValue(String message, String description, String value)
</del><ins>+ LogDiagnosticMessage(String message, String description, enum WebCore::ShouldSample shouldSample)
+ LogDiagnosticMessageWithResult(String message, String description, uint32_t result, enum WebCore::ShouldSample shouldSample)
+ LogDiagnosticMessageWithValue(String message, String description, double value, unsigned significantFigures, enum WebCore::ShouldSample shouldSample)
</ins><span class="cx">
</span><span class="cx"> # Editor notifications
</span><span class="cx"> EditorStateChanged(struct WebKit::EditorState editorState)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDiagnosticLoggingClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+using namespace WebCore;
+
</ins><span class="cx"> WebDiagnosticLoggingClient::WebDiagnosticLoggingClient(WebPage& page)
</span><span class="cx"> : m_page(page)
</span><span class="cx"> {
</span><span class="lines">@@ -50,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove this injected bundle API.
</span><span class="cx"> m_page.injectedBundleDiagnosticLoggingClient().logDiagnosticMessage(&m_page, message, description);
</span><del>- m_page.send(Messages::WebPageProxy::LogSampledDiagnosticMessage(message, description));
</del><ins>+ m_page.send(Messages::WebPageProxy::LogDiagnosticMessage(message, description, ShouldSample::No));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebDiagnosticLoggingClient::logDiagnosticMessageWithResult(const String& message, const String& description, WebCore::DiagnosticLoggingResultType result, WebCore::ShouldSample shouldSample)
</span><span class="lines">@@ -62,10 +64,10 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove this injected bundle API.
</span><span class="cx"> m_page.injectedBundleDiagnosticLoggingClient().logDiagnosticMessageWithResult(&m_page, message, description, result);
</span><del>- m_page.send(Messages::WebPageProxy::LogSampledDiagnosticMessageWithResult(message, description, result));
</del><ins>+ m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithResult(message, description, result, ShouldSample::No));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDiagnosticLoggingClient::logDiagnosticMessageWithValue(const String& message, const String& description, const String& value, WebCore::ShouldSample shouldSample)
</del><ins>+void WebDiagnosticLoggingClient::logDiagnosticMessageWithValue(const String& message, const String& description, double value, unsigned significantFigures, WebCore::ShouldSample shouldSample)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_page.corePage() || m_page.corePage()->settings().diagnosticLoggingEnabled());
</span><span class="cx">
</span><span class="lines">@@ -73,8 +75,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove this injected bundle API.
</span><del>- m_page.injectedBundleDiagnosticLoggingClient().logDiagnosticMessageWithValue(&m_page, message, description, value);
- m_page.send(Messages::WebPageProxy::LogSampledDiagnosticMessageWithValue(message, description, value));
</del><ins>+ m_page.injectedBundleDiagnosticLoggingClient().logDiagnosticMessageWithValue(&m_page, message, description, String::number(value, significantFigures));
+ m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithValue(message, description, value, significantFigures, ShouldSample::No));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDiagnosticLoggingClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h (211375 => 211376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h 2017-01-30 18:18:46 UTC (rev 211375)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h 2017-01-30 18:45:21 UTC (rev 211376)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> private:
</span><span class="cx"> void logDiagnosticMessage(const String& message, const String& description, WebCore::ShouldSample) override;
</span><span class="cx"> void logDiagnosticMessageWithResult(const String& message, const String& description, WebCore::DiagnosticLoggingResultType, WebCore::ShouldSample) override;
</span><del>- void logDiagnosticMessageWithValue(const String& message, const String& description, const String& value, WebCore::ShouldSample) override;
</del><ins>+ void logDiagnosticMessageWithValue(const String& message, const String& description, double value, unsigned significantFigures, WebCore::ShouldSample) override;
</ins><span class="cx">
</span><span class="cx"> WebPage& m_page;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>