<!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>[185603] 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/185603">185603</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-16 12:50:59 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Canvas dimensions should be limited to 4096x4096 pixels on iOS devices.
https://bugs.webkit.org/show_bug.cgi?id=145998
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2015-06-16
Reviewed by Darin Adler.
Source/WebCore:
The value of MaxCanvasArea should depend on the platform. If the platform
is iOS, the limit should be 64M. Otherwise the limit should be 1G.
Test: fast/canvas/pattern-too-large-to-create-2.html
* html/HTMLCanvasElement.cpp: Change MaxCanvasArea value based on the platform.
* rendering/svg/RenderSVGShape.h:
(WebCore::RenderSVGShape::graphicsElement): Remove un-implemented constructor.
LayoutTests:
* fast/canvas/canvas-toDataURL-crash-expected.txt:
* fast/canvas/pattern-too-large-to-create-expected.txt: Change the expected
results due to changing the type of MaxCanvasArea from float to unsigned.
* fast/canvas/canvas-too-large-to-draw-expected.txt: Added.
* fast/canvas/canvas-too-large-to-draw.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvastoDataURLcrashexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-toDataURL-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvaspatterntoolargetocreateexpectedtxt">trunk/LayoutTests/fast/canvas/pattern-too-large-to-create-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGShapeh">trunk/Source/WebCore/rendering/svg/RenderSVGShape.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvascanvastoolargetodrawexpectedtxt">trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvascanvastoolargetodrawhtml">trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185602 => 185603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-16 19:47:49 UTC (rev 185602)
+++ trunk/LayoutTests/ChangeLog 2015-06-16 19:50:59 UTC (rev 185603)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-16 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Canvas dimensions should be limited to 4096x4096 pixels on iOS devices.
+ https://bugs.webkit.org/show_bug.cgi?id=145998
+
+ Reviewed by Darin Adler.
+
+ * fast/canvas/canvas-toDataURL-crash-expected.txt:
+ * fast/canvas/pattern-too-large-to-create-expected.txt: Change the expected
+ results due to changing the type of MaxCanvasArea from float to unsigned.
+
+ * fast/canvas/canvas-too-large-to-draw-expected.txt: Added.
+ * fast/canvas/canvas-too-large-to-draw.html: Added.
+
</ins><span class="cx"> 2015-06-16 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: js/dom/navigator-plugins-crash.html asserts a lot
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvastoDataURLcrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/canvas-toDataURL-crash-expected.txt (185602 => 185603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-toDataURL-crash-expected.txt 2015-06-16 19:47:49 UTC (rev 185602)
+++ trunk/LayoutTests/fast/canvas/canvas-toDataURL-crash-expected.txt 2015-06-16 19:50:59 UTC (rev 185603)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-CONSOLE MESSAGE: line 6: Canvas area exceeds the maximum limit (width * height > 2.68435e+8).
</del><ins>+CONSOLE MESSAGE: line 6: Canvas area exceeds the maximum limit (width * height > 268435456).
</ins><span class="cx"> PASS
</span><span class="cx">
</span><span class="cx"> Calling toDataURL() on a huge canvas shouldn't crash. If the text above is "PASS", the test passed.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvastoolargetodrawexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw-expected.txt (0 => 185603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw-expected.txt 2015-06-16 19:50:59 UTC (rev 185603)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+CONSOLE MESSAGE: line 35: Canvas area exceeds the maximum limit (width * height > 268435456).
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvascanvastoolargetodrawhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw.html (0 => 185603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/canvas-too-large-to-draw.html 2015-06-16 19:50:59 UTC (rev 185603)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ canvas {
+ width: 100px;
+ height: 100px;
+ background-color: red;
+ }
+ </style>
+</head>
+<body>
+ <canvas id="canvas1"></canvas>
+ <canvas id="canvas2"></canvas>
+ <script>
+ if (window.testRunner)
+ window.testRunner.dumpAsText();
+
+ var iOSPlatform = navigator.userAgent.search(/\biPhone OS\b/) != -1;
+ var MAX_WIDTH = iOSPlatform ? Math.pow(2, 12) : Math.pow(2, 14);
+ var MAX_HEIGHT = iOSPlatform ? Math.pow(2, 12) : Math.pow(2, 14);
+
+ function fillCanvas(id, width, height) {
+ var canvas = document.getElementById(id);
+ canvas.width = width;
+ canvas.height = height;
+
+ var ctx = canvas.getContext("2d");
+
+ ctx.fillStyle = "lime";
+ ctx.fillRect(0, 0, width, height);
+ }
+
+ fillCanvas("canvas1", MAX_WIDTH, MAX_HEIGHT);
+ fillCanvas("canvas2", MAX_WIDTH + 1, MAX_HEIGHT);
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvaspatterntoolargetocreateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/pattern-too-large-to-create-expected.txt (185602 => 185603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/pattern-too-large-to-create-expected.txt 2015-06-16 19:47:49 UTC (rev 185602)
+++ trunk/LayoutTests/fast/canvas/pattern-too-large-to-create-expected.txt 2015-06-16 19:50:59 UTC (rev 185603)
</span><span class="lines">@@ -1,2 +1,2 @@
</span><del>-CONSOLE MESSAGE: line 18: Canvas area exceeds the maximum limit (width * height > 2.68435e+8).
</del><ins>+CONSOLE MESSAGE: line 18: Canvas area exceeds the maximum limit (width * height > 268435456).
</ins><span class="cx"> PASS: Saw exception.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185602 => 185603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-16 19:47:49 UTC (rev 185602)
+++ trunk/Source/WebCore/ChangeLog 2015-06-16 19:50:59 UTC (rev 185603)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-06-16 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Canvas dimensions should be limited to 4096x4096 pixels on iOS devices.
+ https://bugs.webkit.org/show_bug.cgi?id=145998
+
+ Reviewed by Darin Adler.
+
+ The value of MaxCanvasArea should depend on the platform. If the platform
+ is iOS, the limit should be 64M. Otherwise the limit should be 1G.
+
+ Test: fast/canvas/pattern-too-large-to-create-2.html
+
+ * html/HTMLCanvasElement.cpp: Change MaxCanvasArea value based on the platform.
+
+ * rendering/svg/RenderSVGShape.h:
+ (WebCore::RenderSVGShape::graphicsElement): Remove un-implemented constructor.
+
</ins><span class="cx"> 2015-06-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r185012): chat frame in Gmail now says "Something's not right"
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (185602 => 185603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2015-06-16 19:47:49 UTC (rev 185602)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2015-06-16 19:50:59 UTC (rev 185603)
</span><span class="lines">@@ -67,7 +67,11 @@
</span><span class="cx"> // Firefox limits width/height to 32767 pixels, but slows down dramatically before it
</span><span class="cx"> // reaches that limit. We limit by area instead, giving us larger maximum dimensions,
</span><span class="cx"> // in exchange for a smaller maximum canvas size. The maximum canvas size is in device pixels.
</span><del>-static const float MaxCanvasArea = 16384 * 16384;
</del><ins>+#if PLATFORM(IOS)
+static const unsigned MaxCanvasArea = 4096 * 4096;
+#else
+static const unsigned MaxCanvasArea = 16384 * 16384;
+#endif
</ins><span class="cx">
</span><span class="cx"> HTMLCanvasElement::HTMLCanvasElement(const QualifiedName& tagName, Document& document)
</span><span class="cx"> : HTMLElement(tagName, document)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGShapeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGShape.h (185602 => 185603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGShape.h 2015-06-16 19:47:49 UTC (rev 185602)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGShape.h 2015-06-16 19:50:59 UTC (rev 185603)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> class RenderSVGShape : public RenderSVGModelObject {
</span><span class="cx"> public:
</span><span class="cx"> RenderSVGShape(SVGGraphicsElement&, Ref<RenderStyle>&&);
</span><del>- RenderSVGShape(SVGGraphicsElement&, Ref<RenderStyle>&&, Path*, bool);
</del><span class="cx"> virtual ~RenderSVGShape();
</span><span class="cx">
</span><span class="cx"> SVGGraphicsElement& graphicsElement() const { return downcast<SVGGraphicsElement>(RenderSVGModelObject::element()); }
</span></span></pre>
</div>
</div>
</body>
</html>