<!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>[211151] 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/211151">211151</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-01-25 09:51:13 -0800 (Wed, 25 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Measure how common it is for content to deal with WebGL context loss
https://bugs.webkit.org/show_bug.cgi?id=166866
<rdar://problem/30171195>
Reviewed by Alex Christensen.
Add diagnostic logging to measure how common it is for sites to handle
WebGL context loss via the webglcontextlost & webglcontextrestored
events.
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::WebGLRenderingContextBase):
(WebCore::WebGLRenderingContextBase::checkForContextLossHandling):
* html/canvas/WebGLRenderingContextBase.h:
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::noKey):
(WebCore::DiagnosticLoggingKeys::yesKey):
(WebCore::DiagnosticLoggingKeys::handlesContextLossKey):
* page/DiagnosticLoggingKeys.h:</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="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseh">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211150 => 211151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-25 17:48:54 UTC (rev 211150)
+++ trunk/Source/WebCore/ChangeLog 2017-01-25 17:51:13 UTC (rev 211151)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-01-25 Chris Dumez <cdumez@apple.com>
+
+ Measure how common it is for content to deal with WebGL context loss
+ https://bugs.webkit.org/show_bug.cgi?id=166866
+ <rdar://problem/30171195>
+
+ Reviewed by Alex Christensen.
+
+ Add diagnostic logging to measure how common it is for sites to handle
+ WebGL context loss via the webglcontextlost & webglcontextrestored
+ events.
+
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::WebGLRenderingContextBase):
+ (WebCore::WebGLRenderingContextBase::checkForContextLossHandling):
+ * html/canvas/WebGLRenderingContextBase.h:
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::noKey):
+ (WebCore::DiagnosticLoggingKeys::yesKey):
+ (WebCore::DiagnosticLoggingKeys::handlesContextLossKey):
+ * page/DiagnosticLoggingKeys.h:
+
</ins><span class="cx"> 2017-01-25 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert r210882, removing support for background-repeat-x/y
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (211150 => 211151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2017-01-25 17:48:54 UTC (rev 211150)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2017-01-25 17:51:13 UTC (rev 211151)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> #include "ANGLEInstancedArrays.h"
</span><span class="cx"> #include "CachedImage.h"
</span><span class="cx"> #include "DOMWindow.h"
</span><ins>+#include "DiagnosticLoggingClient.h"
+#include "DiagnosticLoggingKeys.h"
</ins><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "EXTBlendMinMax.h"
</span><span class="cx"> #include "EXTFragDepth.h"
</span><span class="lines">@@ -100,6 +102,7 @@
</span><span class="cx">
</span><span class="cx"> const double secondsBetweenRestoreAttempts = 1.0;
</span><span class="cx"> const int maxGLErrorsAllowedToConsole = 256;
</span><ins>+static const std::chrono::seconds checkContextLossHandlingDelay { 3 };
</ins><span class="cx">
</span><span class="cx"> namespace {
</span><span class="cx">
</span><span class="lines">@@ -456,8 +459,10 @@
</span><span class="cx"> , m_attributes(attributes)
</span><span class="cx"> , m_numGLErrorsToConsoleAllowed(maxGLErrorsAllowedToConsole)
</span><span class="cx"> , m_isPendingPolicyResolution(true)
</span><ins>+ , m_checkForContextLossHandlingTimer(*this, &WebGLRenderingContextBase::checkForContextLossHandling)
</ins><span class="cx"> {
</span><span class="cx"> registerWithWebGLStateTracker();
</span><ins>+ m_checkForContextLossHandlingTimer.startOneShot(checkContextLossHandlingDelay);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebGLRenderingContextBase::WebGLRenderingContextBase(HTMLCanvasElement& passedCanvas, Ref<GraphicsContext3D>&& context, WebGLContextAttributes attributes)
</span><span class="lines">@@ -469,6 +474,7 @@
</span><span class="cx"> , m_generatedImageCache(4)
</span><span class="cx"> , m_attributes(attributes)
</span><span class="cx"> , m_numGLErrorsToConsoleAllowed(maxGLErrorsAllowedToConsole)
</span><ins>+ , m_checkForContextLossHandlingTimer(*this, &WebGLRenderingContextBase::checkForContextLossHandling)
</ins><span class="cx"> {
</span><span class="cx"> m_contextGroup = WebGLContextGroup::create();
</span><span class="cx"> m_contextGroup->addContext(*this);
</span><span class="lines">@@ -480,8 +486,24 @@
</span><span class="cx"> setupFlags();
</span><span class="cx"> initializeNewContext();
</span><span class="cx"> registerWithWebGLStateTracker();
</span><ins>+ m_checkForContextLossHandlingTimer.startOneShot(checkContextLossHandlingDelay);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+// We check for context loss handling after a few seconds to give the JS a chance to register the event listeners
+// and to discard temporary GL contexts (e.g. feature detection).
+void WebGLRenderingContextBase::checkForContextLossHandling()
+{
+ if (!canvas().renderer())
+ return;
+
+ auto* page = canvas().document().page();
+ if (!page)
+ return;
+
+ bool handlesContextLoss = canvas().hasEventListeners(eventNames().webglcontextlostEvent) && canvas().hasEventListeners(eventNames().webglcontextrestoredEvent);
+ page->diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::webGLKey(), DiagnosticLoggingKeys::handlesContextLossKey(), handlesContextLoss ? DiagnosticLoggingKeys::yesKey() : DiagnosticLoggingKeys::noKey(), ShouldSample::No);
+}
+
</ins><span class="cx"> void WebGLRenderingContextBase::registerWithWebGLStateTracker()
</span><span class="cx"> {
</span><span class="cx"> auto* page = canvas().document().page();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h (211150 => 211151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2017-01-25 17:48:54 UTC (rev 211150)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2017-01-25 17:51:13 UTC (rev 211151)
</span><span class="lines">@@ -827,8 +827,10 @@
</span><span class="cx"> private:
</span><span class="cx"> bool validateArrayBufferType(const char* functionName, GC3Denum type, std::optional<JSC::TypedArrayType>);
</span><span class="cx"> void registerWithWebGLStateTracker();
</span><ins>+ void checkForContextLossHandling();
</ins><span class="cx">
</span><span class="cx"> WebGLStateTracker::Token m_trackerToken;
</span><ins>+ Timer m_checkForContextLossHandlingTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (211150 => 211151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-01-25 17:48:54 UTC (rev 211150)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-01-25 17:51:13 UTC (rev 211151)
</span><span class="lines">@@ -153,6 +153,11 @@
</span><span class="cx"> return ASCIILiteral("neverSeenBefore");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::noKey()
+{
+ return ASCIILiteral("no");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::noCacheKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("noCache");
</span><span class="lines">@@ -633,6 +638,11 @@
</span><span class="cx"> return ASCIILiteral("webView");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::yesKey()
+{
+ return ASCIILiteral("yes");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::zoomedKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("zoomed");
</span><span class="lines">@@ -648,6 +658,11 @@
</span><span class="cx"> return ASCIILiteral("font");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::handlesContextLossKey()
+{
+ return ASCIILiteral("handlesContextLoss");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::prunedDueToMemoryPressureKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("pruned.memoryPressure");
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (211150 => 211151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-01-25 17:48:54 UTC (rev 211150)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-01-25 17:51:13 UTC (rev 211151)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> WEBCORE_EXPORT static String entryWronglyNotWarmedUpKey();
</span><span class="cx"> static String expiredKey();
</span><span class="cx"> static String fontKey();
</span><ins>+ static String handlesContextLossKey();
</ins><span class="cx"> static String hasPluginsKey();
</span><span class="cx"> static String httpsNoStoreKey();
</span><span class="cx"> static String imageKey();
</span><span class="lines">@@ -84,6 +85,7 @@
</span><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><ins>+ static String noKey();
</ins><span class="cx"> static String noCacheKey();
</span><span class="cx"> static String noCurrentHistoryItemKey();
</span><span class="cx"> static String noDocumentLoaderKey();
</span><span class="lines">@@ -158,6 +160,7 @@
</span><span class="cx"> WEBCORE_EXPORT static String wastedSpeculativeWarmupWithoutRevalidationKey();
</span><span class="cx"> WEBCORE_EXPORT static String webGLKey();
</span><span class="cx"> WEBCORE_EXPORT static String webViewKey();
</span><ins>+ static String yesKey();
</ins><span class="cx"> WEBCORE_EXPORT static String zoomedKey();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static String memoryUsageToDiagnosticLoggingKey(uint64_t memoryUsage);
</span></span></pre>
</div>
</div>
</body>
</html>