Changeset 95084 in webkit

Timestamp:

Sep 14, 2011 2:41:41 AM (13 years ago)

Author:

commit-queue@webkit.org

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.bot@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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-large-fills-expected.txt (deleted)
• LayoutTests/fast/canvas/canvas-large-fills.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-14  Sheriff Bot  <webkit.review.bot@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  <pfeldman@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-14  Sheriff Bot  <webkit.review.bot@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  <pfeldman@google.com>
 

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -1473 +1473 @@
     FloatRect canvasRect(0, 0, canvas()->width(), canvas()->height());
     GraphicsContext* c = drawingContext();
-    if (!c)
-        return;
 
     c->save();
@@ -1510 +1508 @@
     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());