b=599698; remove UpdateSurfaceClip speedtrap in canvas drawImage; r+a=shaver

content/canvas/src/nsCanvasRenderingContext2D.cpp

@@ -3575,17 +3575,6 @@ nsCanvasRenderingContext2D::DrawImage(nsIDOMElement *imgElt, float a1,
         dirty = mThebes->UserToDevice(clip);
     }
 
-#if 1
-    // XXX cairo bug workaround; force a clip update on mThebes.
-    // Otherwise, a pixman clip gets left around somewhere, and pixman
-    // (Render) does source clipping as well -- so we end up
-    // compositing with an incorrect clip.  This only seems to affect
-    // fallback cases, which happen when we have CSS scaling going on.
-    // This will blow away the current path, but we already blew it
-    // away in this function earlier.
-    mThebes->UpdateSurfaceClip();
-#endif
-
 FINISH:
     if (NS_SUCCEEDED(rv))
         rv = Redraw(dirty);

content/canvas/test/Makefile.in

@@ -68,10 +68,14 @@ _TEST_FILES_0 = \
 	image_green-redirect^headers^ \
 	test_drawImageIncomplete.html \
 	test_canvas_font_setter.html \
-	test_2d.composite.uncovered.image.source-in.html \
+	test_2d.composite.canvas.destination-atop.html \
-	test_2d.composite.uncovered.image.destination-in.html \
+	test_2d.composite.canvas.destination-in.html \
-	test_2d.composite.uncovered.image.source-out.html \
+	test_2d.composite.canvas.source-in.html \
-	test_2d.composite.uncovered.image.destination-atop.html \
+	test_2d.composite.canvas.source-out.html \
+	test_2d.composite.image.destination-atop.html \
+	test_2d.composite.image.destination-in.html \
+	test_2d.composite.image.source-in.html \
+	test_2d.composite.image.source-out.html \
 	test_mozGetAsFile.html \
 	$(NULL)
 
@@ -89,17 +93,14 @@ _TEST_FILES_0 = \
 #	test_2d.composite.clip.lighter.html \
 #
 
-# Temporarily disabled tests; unbounded operators changed behaviour, need to reevaluate tests
+# Temporarily disabled tests; unbounded operators changed behaviour, need to reevaluate tests.
-#
+# At one point we were passing these accidentally, because the UpdateSurfaceClip at the end
-#	test_2d.composite.canvas.destination-atop.html \
+# of drawImage happened to clear the entire canvas with some operators, which is what these
-#	test_2d.composite.canvas.destination-in.html \
+# tests were checking.
-#	test_2d.composite.canvas.source-in.html \
+#	test_2d.composite.uncovered.image.source-in.html \
-#	test_2d.composite.canvas.source-out.html \
+#	test_2d.composite.uncovered.image.destination-in.html \
-#	test_2d.composite.image.destination-atop.html \
+#	test_2d.composite.uncovered.image.source-out.html \
-#	test_2d.composite.image.destination-in.html \
+#	test_2d.composite.uncovered.image.destination-atop.html \
-#	test_2d.composite.image.source-in.html \
-#	test_2d.composite.image.source-out.html \
-#
 
 # Tests that fail on Mac (possibly because spec is underdefined?).  Bug 407105
 ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)