<!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>[178637] 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/178637">178637</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-01-18 21:14:56 -0800 (Sun, 18 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Out of bounds write in canvas.toDataURL
https://bugs.webkit.org/show_bug.cgi?id=140594
<rdar://problem/19449135>
Reviewed by Alexey Proskuryakov.
Source/WebCore:
In the case where we have a canvas object that does
not have premultiplied alpha (an option you can select
when using WebGL) we have to multiply out the alpha when
converting to JPEG via toDataURL.
For this we created a buffer, but were not accurately
resizing it before flattening the alpha.
Test: fast/canvas/webgl/toDataURL-unpremultipliedAlpha.html
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageDataToDataURL): Call resize once we've
determined we have enough space.
LayoutTests:
Creates a WebGL context that does not have
premultiplied alpha, fills it with 50% transparent white,
and attempts to convert the canvas to a JPEG data URL. This
exercises the code path that was not accurately
allocating data (to flatten the alpha).
* fast/canvas/webgl/toDataURL-unpremultipliedAlpha-expected.txt: Added.
* fast/canvas/webgl/toDataURL-unpremultipliedAlpha.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="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvaswebgltoDataURLunpremultipliedAlphaexpectedtxt">trunk/LayoutTests/fast/canvas/webgl/toDataURL-unpremultipliedAlpha-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebgltoDataURLunpremultipliedAlphahtml">trunk/LayoutTests/fast/canvas/webgl/toDataURL-unpremultipliedAlpha.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178636 => 178637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-19 00:03:33 UTC (rev 178636)
+++ trunk/LayoutTests/ChangeLog 2015-01-19 05:14:56 UTC (rev 178637)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-01-18 Dean Jackson <dino@apple.com>
+
+ Out of bounds write in canvas.toDataURL
+ https://bugs.webkit.org/show_bug.cgi?id=140594
+ <rdar://problem/19449135>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Creates a WebGL context that does not have
+ premultiplied alpha, fills it with 50% transparent white,
+ and attempts to convert the canvas to a JPEG data URL. This
+ exercises the code path that was not accurately
+ allocating data (to flatten the alpha).
+
+ * fast/canvas/webgl/toDataURL-unpremultipliedAlpha-expected.txt: Added.
+ * fast/canvas/webgl/toDataURL-unpremultipliedAlpha.html: Added.
+
</ins><span class="cx"> 2015-01-17 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in JSScope::resolve() on tools.ups.com
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebgltoDataURLunpremultipliedAlphaexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/toDataURL-unpremultipliedAlpha-expected.txt (0 => 178637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/toDataURL-unpremultipliedAlpha-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/toDataURL-unpremultipliedAlpha-expected.txt 2015-01-19 05:14:56 UTC (rev 178637)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Test toDataURL on a non-premultipledAlpha WebGL context.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS gl.getContextAttributes().premultipledAlpha is undefined.
+PASS gl.getContextAttributes().preserveDrawingBuffer is true
+PASS getError was expected value: NO_ERROR : Should be no errors from setup.
+
+Fill the WebGL canvas with solid white at 50% transparency.
+PASS getError was expected value: NO_ERROR : Should be no errors from drawing.
+Convert to a JPEG data URL.
+PASS imageUrl && imageUrl.length > 0 is true
+Append the image to the document.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebgltoDataURLunpremultipliedAlphahtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/toDataURL-unpremultipliedAlpha.html (0 => 178637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/toDataURL-unpremultipliedAlpha.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/toDataURL-unpremultipliedAlpha.html 2015-01-19 05:14:56 UTC (rev 178637)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Test toDataURL to JPEG on a non-premultipledAlpha WebGL context.</title>
+<script src="../../../resources/js-test.js"></script>
+<script src="resources/webgl-test.js"> </script>
+<script src="resources/webgl-test-utils.js"> </script>
+</head>
+<body>
+<div id="description"></div><div id="console"></div>
+<script>
+var wtu = WebGLTestUtils;
+
+if (window.testRunner)
+ testRunner.overridePreference("WebKitWebGLEnabled", "1");
+
+description("Test toDataURL on a non-premultipledAlpha WebGL context.");
+var canvas = document.createElement("canvas");
+var gl = wtu.create3DContext(canvas, { premultipliedAlpha: false, preserveDrawingBuffer: true });
+shouldBeUndefined('gl.getContextAttributes().premultipledAlpha');
+shouldBeTrue('gl.getContextAttributes().preserveDrawingBuffer');
+
+var program = wtu.setupTexturedQuad(gl);
+
+glErrorShouldBe(gl, gl.NO_ERROR, "Should be no errors from setup.");
+
+debug("");
+debug("Fill the WebGL canvas with solid white at 50% transparency.")
+var tex = gl.createTexture();
+wtu.fillTexture(gl, tex, 2, 2, [255, 255, 255, 128], 0);
+var loc = gl.getUniformLocation(program, "tex");
+gl.uniform1i(loc, 0);
+gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
+gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
+gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
+gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
+
+wtu.drawQuad(gl);
+glErrorShouldBe(gl, gl.NO_ERROR, "Should be no errors from drawing.");
+
+debug("Convert to a JPEG data URL.")
+var imageUrl = canvas.toDataURL("image/jpeg");
+shouldBeTrue('imageUrl && imageUrl.length > 0');
+var image = document.createElement("img");
+image.addEventListener("load", function() {
+ debug("Append the image to the document.")
+ document.body.appendChild(image);
+ finishJSTest();
+}, false);
+image.src = imageUrl;
+
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178636 => 178637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-19 00:03:33 UTC (rev 178636)
+++ trunk/Source/WebCore/ChangeLog 2015-01-19 05:14:56 UTC (rev 178637)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-01-18 Dean Jackson <dino@apple.com>
+
+ Out of bounds write in canvas.toDataURL
+ https://bugs.webkit.org/show_bug.cgi?id=140594
+ <rdar://problem/19449135>
+
+ Reviewed by Alexey Proskuryakov.
+
+ In the case where we have a canvas object that does
+ not have premultiplied alpha (an option you can select
+ when using WebGL) we have to multiply out the alpha when
+ converting to JPEG via toDataURL.
+
+ For this we created a buffer, but were not accurately
+ resizing it before flattening the alpha.
+
+ Test: fast/canvas/webgl/toDataURL-unpremultipliedAlpha.html
+
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::ImageDataToDataURL): Call resize once we've
+ determined we have enough space.
+
</ins><span class="cx"> 2015-01-17 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add initial experimental user content filtering API
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (178636 => 178637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-01-19 00:03:33 UTC (rev 178636)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-01-19 05:14:56 UTC (rev 178637)
</span><span class="lines">@@ -540,6 +540,7 @@
</span><span class="cx"> if (!premultipliedData.tryReserveCapacity(size))
</span><span class="cx"> return "data:,";
</span><span class="cx">
</span><ins>+ premultipliedData.resize(size);
</ins><span class="cx"> unsigned char *buffer = premultipliedData.data();
</span><span class="cx"> for (size_t i = 0; i < size; i += 4) {
</span><span class="cx"> unsigned alpha = data[i + 3];
</span></span></pre>
</div>
</div>
</body>
</html>