<!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>[168666] 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/168666">168666</a></dd>
<dt>Author</dt> <dd>roger_fong@apple.com</dd>
<dt>Date</dt> <dd>2014-05-12 18:07:52 -0700 (Mon, 12 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Limit number of active graphics contexts per web process.
https://bugs.webkit.org/show_bug.cgi?id=132833.
<rdar://problem/16888459>
Reviewed by Dean Jackson.
Test: webgl/many-contexts.html
* platform/graphics/GraphicsContext3D.h:
* platform/graphics/mac/GraphicsContext3DMac.mm: Limit number of active contexts to 16.
(WebCore::GraphicsContext3D::create):
(WebCore::GraphicsContext3D::~GraphicsContext3D):
* webgl/many-contexts-expected.txt: Added.
* webgl/many-contexts.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContext3Dh">trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacGraphicsContext3DMacmm">trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebglmanycontextsexpectedtxt">trunk/LayoutTests/webgl/many-contexts-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebglmanycontextshtml">trunk/LayoutTests/webgl/many-contexts.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168665 => 168666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-13 00:32:24 UTC (rev 168665)
+++ trunk/LayoutTests/ChangeLog 2014-05-13 01:07:52 UTC (rev 168666)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-05-12 Roger Fong <roger_fong@apple.com>
+
+ Limit number of active graphics contexts per web process.
+ https://bugs.webkit.org/show_bug.cgi?id=132833.
+ <rdar://problem/16888459>
+
+ Reviewed by Dean Jackson.
+
+ * webgl/many-contexts-expected.txt: Added.
+ * webgl/many-contexts.html: Added.
+
</ins><span class="cx"> 2014-05-12 Dirk Schulze <krit@webkit.org>
</span><span class="cx">
</span><span class="cx"> <svg> with opacity and compositing double-applies its opacity
</span></span></pre></div>
<a id="trunkLayoutTestswebglmanycontextsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webgl/many-contexts-expected.txt (0 => 168666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webgl/many-contexts-expected.txt (rev 0)
+++ trunk/LayoutTests/webgl/many-contexts-expected.txt 2014-05-13 01:07:52 UTC (rev 168666)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if this test did not crash.
</ins></span></pre></div>
<a id="trunkLayoutTestswebglmanycontextshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webgl/many-contexts.html (0 => 168666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webgl/many-contexts.html (rev 0)
+++ trunk/LayoutTests/webgl/many-contexts.html 2014-05-13 01:07:52 UTC (rev 168666)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<div id="result">PASS if this test did not crash and 1000th context was null.</div>
+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ 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);
+ }
+ if (canvii[1000] != null)
+ document.getElementById("result").innerHTML = "FAIL";
+ testRunner.notifyDone();
+}
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168665 => 168666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-13 00:32:24 UTC (rev 168665)
+++ trunk/Source/WebCore/ChangeLog 2014-05-13 01:07:52 UTC (rev 168666)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-05-12 Roger Fong <roger_fong@apple.com>
+
+ Limit number of active graphics contexts per web process.
+ https://bugs.webkit.org/show_bug.cgi?id=132833.
+ <rdar://problem/16888459>
+
+ Reviewed by Dean Jackson.
+
+ Test: webgl/many-contexts.html
+
+ * platform/graphics/GraphicsContext3D.h:
+ * platform/graphics/mac/GraphicsContext3DMac.mm: Limit number of active contexts to 16.
+ (WebCore::GraphicsContext3D::create):
+ (WebCore::GraphicsContext3D::~GraphicsContext3D):
+
</ins><span class="cx"> 2014-05-12 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix fix.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContext3Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (168665 => 168666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-05-13 00:32:24 UTC (rev 168665)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-05-13 01:07:52 UTC (rev 168666)
</span><span class="lines">@@ -968,6 +968,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> GraphicsContext3D(Attributes, HostWindow*, RenderStyle = RenderOffscreen);
</span><ins>+ static int numActiveContexts;
</ins><span class="cx">
</span><span class="cx"> // Helper for packImageData/extractImageData/extractTextureData which implement packing of pixel
</span><span class="cx"> // data into the specified OpenGL destination format and type.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacGraphicsContext3DMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (168665 => 168666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2014-05-13 00:32:24 UTC (rev 168665)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2014-05-13 01:07:52 UTC (rev 168666)
</span><span class="lines">@@ -61,6 +61,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+const int maxActiveContexts = 16;
+int GraphicsContext3D::numActiveContexts = 0;
+
</ins><span class="cx"> // FIXME: This class is currently empty on Mac, but will get populated as
</span><span class="cx"> // the restructuring in https://bugs.webkit.org/show_bug.cgi?id=66903 is done
</span><span class="cx"> class GraphicsContext3DPrivate {
</span><span class="lines">@@ -109,9 +112,19 @@
</span><span class="cx"> {
</span><span class="cx"> // This implementation doesn't currently support rendering directly to the HostWindow.
</span><span class="cx"> if (renderStyle == RenderDirectlyToHostWindow)
</span><del>- return 0;
</del><ins>+ return nullptr;
+
+ if (numActiveContexts >= maxActiveContexts)
+ return nullptr;
+
</ins><span class="cx"> RefPtr<GraphicsContext3D> context = adoptRef(new GraphicsContext3D(attrs, hostWindow, renderStyle));
</span><del>- return context->m_contextObj ? context.release() : 0;
</del><ins>+
+ if (!context->m_contextObj)
+ return nullptr;
+
+ numActiveContexts++;
+
+ return context.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow, GraphicsContext3D::RenderStyle renderStyle)
</span><span class="lines">@@ -319,6 +332,7 @@
</span><span class="cx"> CGLSetCurrentContext(0);
</span><span class="cx"> CGLDestroyContext(m_contextObj);
</span><span class="cx"> #endif
</span><ins>+ numActiveContexts--;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>