<!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>[211229] 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/211229">211229</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-01-26 13:34:45 -0800 (Thu, 26 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix WebGL diagnostic logging
https://bugs.webkit.org/show_bug.cgi?id=167463
<rdar://problem/30216981>
Reviewed by Alex Christensen.
Fix WebGL diagnostic logging so that it no longer uses logDiagnosticMessageWithValue().
This is because the value apparently needs to be numeric on Mac.
Source/WebCore:
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::checkForContextLossHandling):
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::pageHandlesWebGLContextLossKey):
(WebCore::WebCore::DiagnosticLoggingKeys::webGLStateKey):
(WebCore::DiagnosticLoggingKeys::stateKey): Deleted.
(WebCore::DiagnosticLoggingKeys::handlesContextLossKey): Deleted.
(WebCore::WebCore::DiagnosticLoggingKeys::webGLKey): Deleted.
* page/DiagnosticLoggingKeys.h:
Source/WebKit2:
* UIProcess/HighPerformanceGraphicsUsageSampler.cpp:
(WebKit::HighPerformanceGraphicsUsageSampler::timerFired):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</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="#trunkSourceWebKit2UIProcessHighPerformanceGraphicsUsageSamplercpp">trunk/Source/WebKit2/UIProcess/HighPerformanceGraphicsUsageSampler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211228 => 211229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-26 21:19:38 UTC (rev 211228)
+++ trunk/Source/WebCore/ChangeLog 2017-01-26 21:34:45 UTC (rev 211229)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-01-26 Chris Dumez <cdumez@apple.com>
+
+ Fix WebGL diagnostic logging
+ https://bugs.webkit.org/show_bug.cgi?id=167463
+ <rdar://problem/30216981>
+
+ Reviewed by Alex Christensen.
+
+ Fix WebGL diagnostic logging so that it no longer uses logDiagnosticMessageWithValue().
+ This is because the value apparently needs to be numeric on Mac.
+
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::checkForContextLossHandling):
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::pageHandlesWebGLContextLossKey):
+ (WebCore::WebCore::DiagnosticLoggingKeys::webGLStateKey):
+ (WebCore::DiagnosticLoggingKeys::stateKey): Deleted.
+ (WebCore::DiagnosticLoggingKeys::handlesContextLossKey): Deleted.
+ (WebCore::WebCore::DiagnosticLoggingKeys::webGLKey): Deleted.
+ * page/DiagnosticLoggingKeys.h:
+
</ins><span class="cx"> 2017-01-26 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Add support for -webkit-hyphenate-limit-lines
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (211228 => 211229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2017-01-26 21:19:38 UTC (rev 211228)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2017-01-26 21:34:45 UTC (rev 211229)
</span><span class="lines">@@ -501,7 +501,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> bool handlesContextLoss = canvas().hasEventListeners(eventNames().webglcontextlostEvent) && canvas().hasEventListeners(eventNames().webglcontextrestoredEvent);
</span><del>- page->diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::webGLKey(), DiagnosticLoggingKeys::handlesContextLossKey(), handlesContextLoss ? DiagnosticLoggingKeys::yesKey() : DiagnosticLoggingKeys::noKey(), ShouldSample::No);
</del><ins>+ page->diagnosticLoggingClient().logDiagnosticMessage(DiagnosticLoggingKeys::pageHandlesWebGLContextLossKey(), handlesContextLoss ? DiagnosticLoggingKeys::yesKey() : DiagnosticLoggingKeys::noKey(), ShouldSample::No);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebGLRenderingContextBase::registerWithWebGLStateTracker()
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (211228 => 211229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-01-26 21:19:38 UTC (rev 211228)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-01-26 21:34:45 UTC (rev 211229)
</span><span class="lines">@@ -58,6 +58,11 @@
</span><span class="cx"> return ASCIILiteral("postPageBackgrounding");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::pageHandlesWebGLContextLossKey()
+{
+ return ASCIILiteral("pageHandlesWebGLContextLoss");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::postPageLoadKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("postPageLoad");
</span><span class="lines">@@ -483,11 +488,6 @@
</span><span class="cx"> return ASCIILiteral("source");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DiagnosticLoggingKeys::stateKey()
-{
- return ASCIILiteral("state");
-}
-
</del><span class="cx"> String DiagnosticLoggingKeys::streamingMedia()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("streamingMedia");
</span><span class="lines">@@ -658,11 +658,6 @@
</span><span class="cx"> return ASCIILiteral("font");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DiagnosticLoggingKeys::handlesContextLossKey()
-{
- return ASCIILiteral("handlesContextLoss");
-}
-
</del><span class="cx"> String DiagnosticLoggingKeys::prunedDueToMemoryPressureKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("pruned.memoryPressure");
</span><span class="lines">@@ -688,9 +683,9 @@
</span><span class="cx"> return ASCIILiteral("notInCache");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebCore::DiagnosticLoggingKeys::webGLKey()
</del><ins>+String WebCore::DiagnosticLoggingKeys::webGLStateKey()
</ins><span class="cx"> {
</span><del>- return ASCIILiteral("webGL");
</del><ins>+ return ASCIILiteral("webGLState");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DiagnosticLoggingKeys::memoryUsageToDiagnosticLoggingKey(uint64_t memoryUsage)
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (211228 => 211229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-01-26 21:19:38 UTC (rev 211228)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-01-26 21:34:45 UTC (rev 211229)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> WEBCORE_EXPORT static String entryWronglyNotWarmedUpKey();
</span><span class="cx"> static String expiredKey();
</span><span class="cx"> static String fontKey();
</span><del>- static String handlesContextLossKey();
</del><span class="cx"> static String hasPluginsKey();
</span><span class="cx"> static String httpsNoStoreKey();
</span><span class="cx"> static String imageKey();
</span><span class="lines">@@ -101,6 +100,7 @@
</span><span class="cx"> static String pageContainsAtLeastOnePluginKey();
</span><span class="cx"> static String pageContainsMediaEngineKey();
</span><span class="cx"> static String pageContainsPluginKey();
</span><ins>+ static String pageHandlesWebGLContextLossKey();
</ins><span class="cx"> static String pageLoadedKey();
</span><span class="cx"> static String playedKey();
</span><span class="cx"> static String pluginLoadedKey();
</span><span class="lines">@@ -128,7 +128,6 @@
</span><span class="cx"> static String sameLoadKey();
</span><span class="cx"> static String scriptKey();
</span><span class="cx"> static String sourceKey();
</span><del>- WEBCORE_EXPORT static String stateKey();
</del><span class="cx"> WEBCORE_EXPORT static String streamingMedia();
</span><span class="cx"> static String styleSheetKey();
</span><span class="cx"> WEBCORE_EXPORT static String successfulSpeculativeWarmupWithRevalidationKey();
</span><span class="lines">@@ -158,7 +157,7 @@
</span><span class="cx"> WEBCORE_EXPORT static String visibleAndActiveStateKey();
</span><span class="cx"> WEBCORE_EXPORT static String wastedSpeculativeWarmupWithRevalidationKey();
</span><span class="cx"> WEBCORE_EXPORT static String wastedSpeculativeWarmupWithoutRevalidationKey();
</span><del>- WEBCORE_EXPORT static String webGLKey();
</del><ins>+ WEBCORE_EXPORT static String webGLStateKey();
</ins><span class="cx"> WEBCORE_EXPORT static String webViewKey();
</span><span class="cx"> static String yesKey();
</span><span class="cx"> WEBCORE_EXPORT static String zoomedKey();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211228 => 211229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-26 21:19:38 UTC (rev 211228)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-26 21:34:45 UTC (rev 211229)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-01-26 Chris Dumez <cdumez@apple.com>
+
+ Fix WebGL diagnostic logging
+ https://bugs.webkit.org/show_bug.cgi?id=167463
+ <rdar://problem/30216981>
+
+ Reviewed by Alex Christensen.
+
+ Fix WebGL diagnostic logging so that it no longer uses logDiagnosticMessageWithValue().
+ This is because the value apparently needs to be numeric on Mac.
+
+ * UIProcess/HighPerformanceGraphicsUsageSampler.cpp:
+ (WebKit::HighPerformanceGraphicsUsageSampler::timerFired):
+
</ins><span class="cx"> 2017-01-26 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for recognizing data interaction gestures in WebKit2
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessHighPerformanceGraphicsUsageSamplercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/HighPerformanceGraphicsUsageSampler.cpp (211228 => 211229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/HighPerformanceGraphicsUsageSampler.cpp 2017-01-26 21:19:38 UTC (rev 211228)
+++ trunk/Source/WebKit2/UIProcess/HighPerformanceGraphicsUsageSampler.cpp 2017-01-26 21:34:45 UTC (rev 211229)
</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->logDiagnosticMessageWithValue(DiagnosticLoggingKeys::webGLKey(), DiagnosticLoggingKeys::stateKey(), state, false);
</del><ins>+ firstPage->logDiagnosticMessage(DiagnosticLoggingKeys::webGLStateKey(), state, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>