<!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>[202192] trunk</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/202192">202192</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-06-17 18:06:45 -0700 (Fri, 17 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/199819">r199819</a>): CrashTracer: [GraphicsContext3D::getInternalFramebufferSize
https://bugs.webkit.org/show_bug.cgi?id=158895
<rdar://problem/26423617>
Reviewed by Zalan Bujtas.
Source/WebCore:
In <a href="http://trac.webkit.org/projects/webkit/changeset/199819">r199819</a> we started resetting contexts if the page had too
many. Unfortunately there were entry points in the WebGL context
that didn't check for the validity of the object before trying
to access the lower level objects.
Test: webgl/many-contexts-access-after-loss.html
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::drawingBufferWidth): Return 0 if we're lost.
(WebCore::WebGLRenderingContextBase::drawingBufferHeight): Ditto.
LayoutTests:
New test to access the contexts after loss. Also cleaned
up the JavaScript code in the existing test (and made sure
it ran outside of the test system).
* webgl/many-contexts-access-after-loss-expected.txt: Added.
* webgl/many-contexts-access-after-loss.html: Added.
* webgl/many-contexts.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestswebglmanycontextshtml">trunk/LayoutTests/webgl/many-contexts.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebglmanycontextsaccessafterlossexpectedtxt">trunk/LayoutTests/webgl/many-contexts-access-after-loss-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebglmanycontextsaccessafterlosshtml">trunk/LayoutTests/webgl/many-contexts-access-after-loss.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202191 => 202192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-18 01:05:53 UTC (rev 202191)
+++ trunk/LayoutTests/ChangeLog 2016-06-18 01:06:45 UTC (rev 202192)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-17 Dean Jackson <dino@apple.com>
+
+ REGRESSION (r199819): CrashTracer: [GraphicsContext3D::getInternalFramebufferSize
+ https://bugs.webkit.org/show_bug.cgi?id=158895
+ <rdar://problem/26423617>
+
+ Reviewed by Zalan Bujtas.
+
+ New test to access the contexts after loss. Also cleaned
+ up the JavaScript code in the existing test (and made sure
+ it ran outside of the test system).
+
+ * webgl/many-contexts-access-after-loss-expected.txt: Added.
+ * webgl/many-contexts-access-after-loss.html: Added.
+ * webgl/many-contexts.html:
+
</ins><span class="cx"> 2016-06-17 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Web video playback controls should have RTL volume slider
</span></span></pre></div>
<a id="trunkLayoutTestswebglmanycontextsaccessafterlossexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webgl/many-contexts-access-after-loss-expected.txt (0 => 202192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webgl/many-contexts-access-after-loss-expected.txt (rev 0)
+++ trunk/LayoutTests/webgl/many-contexts-access-after-loss-expected.txt 2016-06-18 01:06:45 UTC (rev 202192)
</span><span class="lines">@@ -0,0 +1,185 @@
</span><ins>+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 13: There are too many active WebGL contexts on this page, the oldest context will be lost.
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 0
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+CONSOLE MESSAGE: line 17: 1
+PASS if this test did not crash.
</ins><span class="cx">Property changes on: trunk/LayoutTests/webgl/many-contexts-access-after-loss-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestswebglmanycontextsaccessafterlosshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webgl/many-contexts-access-after-loss.html (0 => 202192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webgl/many-contexts-access-after-loss.html (rev 0)
+++ trunk/LayoutTests/webgl/many-contexts-access-after-loss.html 2016-06-18 01:06:45 UTC (rev 202192)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<div id="result">PASS if this test did not crash.</div>
+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+let size = 100;
+let canvii = new Array();
+for (let i = 0; i < size; i++) {
+ canvii[i] = document.createElement("canvas");
+ canvii[i].width = 1;
+ canvii[i].height = 1;
+ canvii[i].getContext("webgl");
+}
+for (let i = 0; i < size; i++) {
+ let context = canvii[i].getContext("webgl");
+ console.log(context.drawingBufferWidth);
+}
+if (window.testRunner)
+ testRunner.notifyDone();
+</script>
</ins><span class="cx">Property changes on: trunk/LayoutTests/webgl/many-contexts-access-after-loss.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestswebglmanycontextshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webgl/many-contexts.html (202191 => 202192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webgl/many-contexts.html 2016-06-18 01:05:53 UTC (rev 202191)
+++ trunk/LayoutTests/webgl/many-contexts.html 2016-06-18 01:06:45 UTC (rev 202192)
</span><span class="lines">@@ -3,14 +3,14 @@
</span><span class="cx"> if (window.testRunner) {
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx"> testRunner.dumpAsText();
</span><del>- var size = 1000;
- var canvii = new Array();
- for (var i = 0; i < size; i++) {
- canvii[i] = document.createElement("canvas");
- canvii[i].width = 1;
- canvii[i].height = 1;
- var context = canvii[i].getContext("webgl", null);
- }
</del><ins>+}
+let canvii = new Array();
+for (let i = 0; i < 1000; i++) {
+ canvii[i] = document.createElement("canvas");
+ canvii[i].width = 1;
+ canvii[i].height = 1;
+ canvii[i].getContext("webgl");
+}
+if (window.testRunner)
</ins><span class="cx"> testRunner.notifyDone();
</span><del>-}
</del><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202191 => 202192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-18 01:05:53 UTC (rev 202191)
+++ trunk/Source/WebCore/ChangeLog 2016-06-18 01:06:45 UTC (rev 202192)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-06-17 Dean Jackson <dino@apple.com>
+
+ REGRESSION (r199819): CrashTracer: [GraphicsContext3D::getInternalFramebufferSize
+ https://bugs.webkit.org/show_bug.cgi?id=158895
+ <rdar://problem/26423617>
+
+ Reviewed by Zalan Bujtas.
+
+ In r199819 we started resetting contexts if the page had too
+ many. Unfortunately there were entry points in the WebGL context
+ that didn't check for the validity of the object before trying
+ to access the lower level objects.
+
+ Test: webgl/many-contexts-access-after-loss.html
+
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::drawingBufferWidth): Return 0 if we're lost.
+ (WebCore::WebGLRenderingContextBase::drawingBufferHeight): Ditto.
+
</ins><span class="cx"> 2016-06-17 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r202186.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (202191 => 202192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-06-18 01:05:53 UTC (rev 202191)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-06-18 01:06:45 UTC (rev 202192)
</span><span class="lines">@@ -804,6 +804,9 @@
</span><span class="cx">
</span><span class="cx"> int WebGLRenderingContextBase::drawingBufferWidth() const
</span><span class="cx"> {
</span><ins>+ if (isContextLost())
+ return 0;
+
</ins><span class="cx"> if (m_isPendingPolicyResolution && !m_hasRequestedPolicyResolution)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -812,6 +815,9 @@
</span><span class="cx">
</span><span class="cx"> int WebGLRenderingContextBase::drawingBufferHeight() const
</span><span class="cx"> {
</span><ins>+ if (isContextLost())
+ return 0;
+
</ins><span class="cx"> if (m_isPendingPolicyResolution && !m_hasRequestedPolicyResolution)
</span><span class="cx"> return 0;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>