<!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>[70957] 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/70957">70957</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2010-10-29 17:13:13 -0700 (Fri, 29 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-10-29  Mike Lawther  &lt;mikelawther@chromium.org&gt;

        Reviewed by James Robinson.

        Fix canvas/philip/tests/2d.imageData.get.source.negative
        https://bugs.webkit.org/show_bug.cgi?id=48277

        Remove canvas/philip/tests/2d.imageData.get.source.negative from chromium skipped.
        Also remove spurious trailing newlines from 2d.imageData.get.source.negative-expected.txt

        * canvas/philip/tests/2d.imageData.get.source.negative-expected.txt:
        * platform/chromium/test_expectations.txt:
2010-10-29  Mike Lawther  &lt;mikelawther@chromium.org&gt;

        Reviewed by James Robinson.

        Fix canvas/philip/tests/2d.imageData.get.source.negative
        https://bugs.webkit.org/show_bug.cgi?id=48277

        Handle negative width/height.
        See http://www.whatwg.org/specs/web-apps/current-work/multipage/the-canvas-element.html#pixel-manipulation

        * html/canvas/CanvasRenderingContext2D.cpp:
        (WebCore::CanvasRenderingContext2D::getImageData):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscanvasphiliptests2dimageDatagetsourcenegativeexpectedtxt">trunk/LayoutTests/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformchromiumtest_expectationstxt">trunk/LayoutTests/platform/chromium/test_expectations.txt</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacsnowleopardcanvasphiliptests2dimageDatagetsourcenegativeexpectedtxt">trunk/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (70956 => 70957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2010-10-29 23:57:20 UTC (rev 70956)
+++ trunk/LayoutTests/ChangeLog        2010-10-30 00:13:13 UTC (rev 70957)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2010-10-29  Mike Lawther  &lt;mikelawther@chromium.org&gt;
+
+        Reviewed by James Robinson.
+
+        Fix canvas/philip/tests/2d.imageData.get.source.negative
+        https://bugs.webkit.org/show_bug.cgi?id=48277
+
+        Remove canvas/philip/tests/2d.imageData.get.source.negative from chromium skipped.
+        Also remove spurious trailing newlines from 2d.imageData.get.source.negative-expected.txt
+
+        * canvas/philip/tests/2d.imageData.get.source.negative-expected.txt:
+        * platform/chromium/test_expectations.txt:
+
</ins><span class="cx"> 2010-10-29  Aaron Colwell  &lt;acolwell@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by David Levin.
</span></span></pre></div>
<a id="trunkLayoutTestscanvasphiliptests2dimageDatagetsourcenegativeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt (70956 => 70957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt        2010-10-29 23:57:20 UTC (rev 70956)
+++ trunk/LayoutTests/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt        2010-10-30 00:13:13 UTC (rev 70957)
</span><span class="lines">@@ -4,6 +4,3 @@
</span><span class="cx"> References: 2d.imageData.get.basic 2d.pixelarray.order
</span><span class="cx"> Actual output:
</span><span class="cx"> Passed
</span><del>-
-
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformchromiumtest_expectationstxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (70956 => 70957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/chromium/test_expectations.txt        2010-10-29 23:57:20 UTC (rev 70956)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt        2010-10-30 00:13:13 UTC (rev 70957)
</span><span class="lines">@@ -2565,7 +2565,6 @@
</span><span class="cx"> BUG45991 : canvas/philip/tests/2d.fillStyle.parse.current.changed.html = TEXT PASS
</span><span class="cx"> BUG45991 : canvas/philip/tests/2d.fillStyle.parse.current.removed.html = TEXT PASS
</span><span class="cx"> BUG45991 : canvas/philip/tests/2d.fillStyle.parse.system.html = TEXT PASS
</span><del>-BUG45991 : canvas/philip/tests/2d.imageData.get.source.negative.html = TEXT PASS
</del><span class="cx"> BUG45991 : canvas/philip/tests/2d.path.rect.winding.html = TEXT PASS
</span><span class="cx"> BUG45991 : canvas/philip/tests/2d.pattern.image.undefined.html = TEXT PASS
</span><span class="cx"> BUG45991 : canvas/philip/tests/2d.shadow.gradient.alpha.html = TEXT PASS
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacsnowleopardcanvasphiliptests2dimageDatagetsourcenegativeexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt (70956 => 70957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt        2010-10-29 23:57:20 UTC (rev 70956)
+++ trunk/LayoutTests/platform/mac-snowleopard/canvas/philip/tests/2d.imageData.get.source.negative-expected.txt        2010-10-30 00:13:13 UTC (rev 70957)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-&lt; [index] &gt;
-2d.imageData.get.source.negative
-getImageData() works with negative width and height, and returns top-to-bottom left-to-right
-References: 2d.imageData.get.basic 2d.pixelarray.order
-Actual output:
-Failed assertion imgdata1.data[&quot;0&quot;] === 255 (got 0[number], expected 255[number])
-Failed assertion imgdata1.data[&quot;1&quot;] === 255 (got 0[number], expected 255[number])
-Failed assertion imgdata1.data[&quot;2&quot;] === 255 (got 0[number], expected 255[number])
-Failed assertion imgdata2.data[&quot;3&quot;] === 0 (got 255[number], expected 0[number])
</del></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (70956 => 70957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-10-29 23:57:20 UTC (rev 70956)
+++ trunk/WebCore/ChangeLog        2010-10-30 00:13:13 UTC (rev 70957)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2010-10-29  Mike Lawther  &lt;mikelawther@chromium.org&gt;
+
+        Reviewed by James Robinson.
+
+        Fix canvas/philip/tests/2d.imageData.get.source.negative
+        https://bugs.webkit.org/show_bug.cgi?id=48277
+
+        Handle negative width/height.
+        See http://www.whatwg.org/specs/web-apps/current-work/multipage/the-canvas-element.html#pixel-manipulation
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::getImageData):
+
</ins><span class="cx"> 2010-10-29  Kavita Kanetkar  &lt;kkanetkar@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Pavel Feldman.
</span></span></pre></div>
<a id="trunkWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp (70956 => 70957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp        2010-10-29 23:57:20 UTC (rev 70956)
+++ trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp        2010-10-30 00:13:13 UTC (rev 70957)
</span><span class="lines">@@ -1582,6 +1582,15 @@
</span><span class="cx">         return 0;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    if (sw &lt; 0) {
+        sx += sw;
+        sw = -sw;
+    }    
+    if (sh &lt; 0) {
+        sy += sh;
+        sh = -sh;
+    }
+    
</ins><span class="cx">     FloatRect unscaledRect(sx, sy, sw, sh);
</span><span class="cx">     IntRect scaledRect = canvas()-&gt;convertLogicalToDevice(unscaledRect);
</span><span class="cx">     if (scaledRect.width() &lt; 1)
</span></span></pre>
</div>
</div>

</body>
</html>