Log Message
Unreviewed, rolling out r95080. http://trac.webkit.org/changeset/95080 https://bugs.webkit.org/show_bug.cgi?id=68070
It caused some 2d.composite.uncovered tests fail (Requested by rgabor on #webkit). Patch by Sheriff Bot <webkit.review....@gmail.com> on 2011-09-14 Source/WebCore: * html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::clearCanvas): (WebCore::CanvasRenderingContext2D::fillAndDisplayTransparencyElsewhere): LayoutTests: * fast/canvas/canvas-large-fills-expected.txt: Removed. * fast/canvas/canvas-large-fills.html: Removed.
Modified Paths
- trunk/LayoutTests/ChangeLog
- trunk/Source/WebCore/ChangeLog
- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (95083 => 95084)
--- trunk/LayoutTests/ChangeLog 2011-09-14 09:29:31 UTC (rev 95083)
+++ trunk/LayoutTests/ChangeLog 2011-09-14 09:41:41 UTC (rev 95084)
@@ -1,3 +1,15 @@
+2011-09-14 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r95080.
+ http://trac.webkit.org/changeset/95080
+ https://bugs.webkit.org/show_bug.cgi?id=68070
+
+ It caused some 2d.composite.uncovered tests fail (Requested by
+ rgabor on #webkit).
+
+ * fast/canvas/canvas-large-fills-expected.txt: Removed.
+ * fast/canvas/canvas-large-fills.html: Removed.
+
2011-09-13 Pavel Feldman <pfeld...@google.com>
Web Inspector: [v8] building call frame info for location-less internal script function crashes.
Deleted: trunk/LayoutTests/fast/canvas/canvas-large-fills-expected.txt (95083 => 95084)
--- trunk/LayoutTests/fast/canvas/canvas-large-fills-expected.txt 2011-09-14 09:29:31 UTC (rev 95083)
+++ trunk/LayoutTests/fast/canvas/canvas-large-fills-expected.txt 2011-09-14 09:41:41 UTC (rev 95084)
@@ -1,138 +0,0 @@
-Tests that using the different composite modes to fill large rects doesn't crash and works as expected.
-
-size == 10000
-source-over
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-source-in
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-source-out
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-source-atop
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-destination-over
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-PASS Actual: 0 Expected: 0
-destination-in
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-PASS Actual: 0 Expected: 0
-destination-out
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-destination-atop
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-PASS Actual: 0 Expected: 0
-lighter
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-PASS Actual: 255 Expected: 255
-copy
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-xor
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-size == 50000
-source-over
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-source-in
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-source-out
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-source-atop
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-destination-over
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-PASS Actual: 0 Expected: 0
-destination-in
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-PASS Actual: 0 Expected: 0
-destination-out
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-destination-atop
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-PASS Actual: 0 Expected: 0
-lighter
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-PASS Actual: 255 Expected: 255
-copy
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-xor
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-size == 100000
-source-over
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-source-in
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-source-out
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-source-atop
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-destination-over
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-PASS Actual: 0 Expected: 0
-destination-in
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-PASS Actual: 0 Expected: 0
-destination-out
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-destination-atop
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-PASS Actual: 0 Expected: 0
-lighter
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-PASS Actual: 255 Expected: 255
-copy
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 255 Expected: 255
-xor
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-PASS Actual: 0 Expected: 0
-
Deleted: trunk/LayoutTests/fast/canvas/canvas-large-fills.html (95083 => 95084)
--- trunk/LayoutTests/fast/canvas/canvas-large-fills.html 2011-09-14 09:29:31 UTC (rev 95083)
+++ trunk/LayoutTests/fast/canvas/canvas-large-fills.html 2011-09-14 09:41:41 UTC (rev 95084)
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<title>Canvas test: test large width/height values</title>
-<script src=""
-<body>
-<p>Tests that using the different composite modes to fill large rects doesn't crash and works as expected.</p>
-<pre id="console"></pre>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-var canvas = document.getElementById("c");
-var ctx = canvas.getContext("2d");
-var x, y, w=1, h=1;
-var width=canvas.width;
-var height=canvas.height;
-
-function clearContext() {
- ctx.globalCompositeOperation="source-over";
- ctx.fillStyle = "rgb(0, 255, 0)";
- ctx.fillRect(0, 0, width, height);
-}
-
-var compositeTypes = [
- 'source-over','source-in','source-out','source-atop',
- 'destination-over','destination-in','destination-out','destination-atop',
- 'lighter','copy','xor'
-];
-
-var expected = [
- [0, 0, 255], [0, 0, 255], [0, 0, 0], [0, 0, 255],
- [0, 255, 0], [0, 255, 0], [0, 0, 0], [0, 255, 0],
- [0, 255, 255], [0, 0, 255], [0, 0, 0]
-];
-
-function testFills(size) {
- var msg = "size == "+size;
- debug(msg);
- for (var i=0; i < compositeTypes.length; i++) {
- clearContext(ctx);
- ctx.fillStyle = "rgb(0, 0, 255)";
- ctx.globalCompositeOperation = compositeTypes[i];
- debug(compositeTypes[i]);
- ctx.fillRect(0, 0, size, size);
- var data = "" 0, width, height);
- for (var x = 0; x < 3; x++) {
- var msg = "Actual: " + data.data[x] + " Expected: " + expected[i][x];
- if (data.data[x] == expected[i][x])
- testPassed(msg);
- else
- testFailed(msg);
- }
- }
-}
-
-testFills(10000);
-testFills(50000);
-testFills(100000);
-
-</script>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (95083 => 95084)
--- trunk/Source/WebCore/ChangeLog 2011-09-14 09:29:31 UTC (rev 95083)
+++ trunk/Source/WebCore/ChangeLog 2011-09-14 09:41:41 UTC (rev 95084)
@@ -1,3 +1,16 @@
+2011-09-14 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r95080.
+ http://trac.webkit.org/changeset/95080
+ https://bugs.webkit.org/show_bug.cgi?id=68070
+
+ It caused some 2d.composite.uncovered tests fail (Requested by
+ rgabor on #webkit).
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::clearCanvas):
+ (WebCore::CanvasRenderingContext2D::fillAndDisplayTransparencyElsewhere):
+
2011-09-13 Pavel Feldman <pfeld...@google.com>
Web Inspector: [v8] building call frame info for location-less internal script function crashes.
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (95083 => 95084)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2011-09-14 09:29:31 UTC (rev 95083)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2011-09-14 09:41:41 UTC (rev 95084)
@@ -1472,8 +1472,6 @@
{
FloatRect canvasRect(0, 0, canvas()->width(), canvas()->height());
GraphicsContext* c = drawingContext();
- if (!c)
- return;
c->save();
c->setCTM(canvas()->baseTransform());
@@ -1509,26 +1507,20 @@
{
ASSERT(shouldDisplayTransparencyElsewhere());
- IntRect canvasRect(0, 0, canvas()->width(), canvas()->height());
- canvasRect = canvas()->baseTransform().mapRect(canvasRect);
Path path = transformAreaToDevice(area);
IntRect bufferRect = enclosingIntRect(path.boundingRect());
- bufferRect.intersect(canvasRect);
path.translate(FloatSize(-bufferRect.x(), -bufferRect.y()));
RenderingMode renderMode = canvas()->buffer()->isAccelerated() ? Accelerated : Unaccelerated;
OwnPtr<ImageBuffer> buffer = ImageBuffer::create(bufferRect.size(), ColorSpaceDeviceRGB, renderMode);
- if (!buffer)
- return;
-
buffer->context()->setCompositeOperation(CompositeSourceOver);
state().m_fillStyle->applyFillColor(buffer->context());
buffer->context()->fillPath(path);
- GraphicsContext* c = drawingContext();
- if (!c)
- return;
+ FloatRect canvasRect(0, 0, canvas()->width(), canvas()->height());
+ canvasRect = canvas()->baseTransform().mapRect(canvasRect);
+ GraphicsContext* c = drawingContext();
c->save();
c->setCTM(AffineTransform());
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
