diff --git a/content/canvas/test/Makefile.in b/content/canvas/test/Makefile.in
index 11a563197a12..5ca911ae520c 100644
--- a/content/canvas/test/Makefile.in
+++ b/content/canvas/test/Makefile.in
@@ -44,8 +44,7 @@ relativesrcdir  = content/canvas/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
-
-_TEST_FILES_A = \
+_TEST_FILES_0 = \
 	test_fallback.basic.html \
 	test_fallback.multiple.html \
 	test_fallback.nested.html \
@@ -87,11 +86,26 @@ _TEST_FILES_A = \
 	test_initial.reset.transform.html \
 	test_initial.reset.gradient.html \
 	test_initial.reset.pattern.html \
+	test_context.emptystring.html \
+	test_context.unrecognised.badname.html \
+	test_context.unrecognised.badsuffix.html \
+	test_context.unrecognised.nullsuffix.html \
+	test_context.unrecognised.unicode.html \
+	test_context.casesensitive.html \
+	test_context.arguments.missing.html \
+	test_context.arguments.extra.html \
 	test_toDataURL.default.html \
 	test_toDataURL.png.html \
+	test_toDataURL.unrecognised.html \
+	test_toDataURL.lowercase.html \
+	test_toDataURL.arguments.1.html \
+	test_toDataURL.arguments.2.html \
+	test_toDataURL.arguments.3.html \
 	test_toDataURL.nocontext.html \
+	test_toDataURL.zerosize.html \
+	test_toDataURL.primarycolours.html \
+	test_toDataURL.complexcolours.html \
 	test_2d.getcontext.exists.html \
-	test_2d.type.name.html \
 	test_2d.type.exists.html \
 	test_2d.type.delete.html \
 	test_2d.type.prototype.html \
@@ -100,6 +114,8 @@ _TEST_FILES_A = \
 	test_2d.getcontext.unique.html \
 	test_2d.getcontext.shared.html \
 	test_2d.voidreturn.html \
+	test_2d.missingargs.html \
+	test_2d.scaled.html \
 	test_2d.canvas.reference.html \
 	test_2d.canvas.readonly.html \
 	test_2d.state.saverestore.strokeStyle.html \
@@ -121,39 +137,40 @@ _TEST_FILES_A = \
 	test_2d.state.saverestore.bitmap.html \
 	test_2d.state.saverestore.stack.html \
 	test_2d.state.saverestore.stackdepth.html \
+	test_2d.state.saverestore.underflow.html \
 	test_2d.transformation.order.html \
 	test_2d.transformation.scale.basic.html \
 	test_2d.transformation.scale.zero.html \
 	test_2d.transformation.scale.negative.html \
 	test_2d.transformation.scale.large.html \
+	test_2d.transformation.scale.nonfinite.html \
 	test_2d.transformation.scale.multiple.html \
+	$(NULL)
+
+_TEST_FILES_1 = \
 	test_2d.transformation.rotate.zero.html \
 	test_2d.transformation.rotate.radians.html \
 	test_2d.transformation.rotate.direction.html \
 	test_2d.transformation.rotate.wrap.html \
 	test_2d.transformation.rotate.wrapnegative.html \
-	test_2d.transformation.rotate.infinity.html \
-	test_2d.transformation.rotate.neginfinity.html \
-	test_2d.transformation.rotate.nan.html \
+	test_2d.transformation.rotate.nonfinite.html \
 	test_2d.transformation.translate.basic.html \
+	test_2d.transformation.translate.nonfinite.html \
 	test_2d.transformation.transform.identity.html \
 	test_2d.transformation.transform.skewed.html \
 	test_2d.transformation.transform.multiply.html \
+	test_2d.transformation.transform.nonfinite.html \
 	test_2d.transformation.setTransform.skewed.html \
 	test_2d.transformation.setTransform.multiple.html \
+	test_2d.transformation.setTransform.nonfinite.html \
 	test_2d.composite.globalAlpha.range.html \
+	test_2d.composite.globalAlpha.invalid.html \
 	test_2d.composite.globalAlpha.default.html \
 	test_2d.composite.globalAlpha.fill.html \
 	test_2d.composite.globalAlpha.image.html \
 	test_2d.composite.globalAlpha.canvas.html \
 	test_2d.composite.globalAlpha.imagepattern.html \
 	test_2d.composite.globalAlpha.canvaspattern.html \
-	$(NULL)
-# The following two tests tend to fail randomly.
-#       test_toDataURL.primarycolours.html 
-#       test_toDataURL.complexcolours.html 
-
-_TEST_FILES_B = \
 	test_2d.composite.solid.source-over.html \
 	test_2d.composite.solid.destination-over.html \
 	test_2d.composite.solid.source-in.html \
@@ -162,6 +179,7 @@ _TEST_FILES_B = \
 	test_2d.composite.solid.destination-out.html \
 	test_2d.composite.solid.source-atop.html \
 	test_2d.composite.solid.destination-atop.html \
+	test_2d.composite.solid.xor.html \
 	test_2d.composite.solid.copy.html \
 	test_2d.composite.solid.lighter.html \
 	test_2d.composite.transparent.source-over.html \
@@ -176,20 +194,56 @@ _TEST_FILES_B = \
 	test_2d.composite.transparent.copy.html \
 	test_2d.composite.transparent.lighter.html \
 	test_2d.composite.image.source-over.html \
-	test_2d.composite.image.source-in.html \
-	test_2d.composite.image.source-out.html \
-	test_2d.composite.image.source-atop.html \
 	test_2d.composite.image.destination-over.html \
+	test_2d.composite.image.source-in.html \
 	test_2d.composite.image.destination-in.html \
+	test_2d.composite.image.source-out.html \
 	test_2d.composite.image.destination-out.html \
+	test_2d.composite.image.source-atop.html \
 	test_2d.composite.image.destination-atop.html \
 	test_2d.composite.image.xor.html \
 	test_2d.composite.image.copy.html \
 	test_2d.composite.image.lighter.html \
+	test_2d.composite.canvas.source-over.html \
+	test_2d.composite.canvas.destination-over.html \
+	test_2d.composite.canvas.source-in.html \
+	test_2d.composite.canvas.destination-in.html \
+	test_2d.composite.canvas.source-out.html \
+	test_2d.composite.canvas.destination-out.html \
+	test_2d.composite.canvas.source-atop.html \
+	test_2d.composite.canvas.destination-atop.html \
+	test_2d.composite.canvas.xor.html \
+	test_2d.composite.canvas.copy.html \
+	test_2d.composite.canvas.lighter.html \
+	test_2d.composite.uncovered.fill.copy.html \
+	test_2d.composite.uncovered.image.source-in.html \
+	test_2d.composite.uncovered.image.destination-in.html \
+	test_2d.composite.uncovered.image.source-out.html \
+	test_2d.composite.uncovered.image.destination-atop.html \
+	test_2d.composite.uncovered.image.copy.html \
+	test_2d.composite.uncovered.pattern.copy.html \
+	test_2d.composite.clip.source-over.html \
+	test_2d.composite.clip.destination-over.html \
+	test_2d.composite.clip.source-in.html \
+	test_2d.composite.clip.destination-in.html \
+	test_2d.composite.clip.source-out.html \
+	test_2d.composite.clip.destination-out.html \
+	test_2d.composite.clip.source-atop.html \
+	test_2d.composite.clip.destination-atop.html \
+	test_2d.composite.clip.xor.html \
+	test_2d.composite.clip.copy.html \
+	test_2d.composite.clip.lighter.html \
 	test_2d.composite.operation.get.html \
+	test_2d.composite.operation.unrecognised.html \
 	test_2d.composite.operation.darker.html \
 	test_2d.composite.operation.over.html \
 	test_2d.composite.operation.clear.html \
+	test_2d.composite.operation.highlight.html \
+	test_2d.composite.operation.nullsuffix.html \
+	$(NULL)
+
+_TEST_FILES_2 = \
+	test_2d.composite.operation.casesensitive.html \
 	test_2d.composite.operation.default.html \
 	test_2d.fillStyle.parse.html4.html \
 	test_2d.fillStyle.parse.hex3.html \
@@ -197,6 +251,9 @@ _TEST_FILES_B = \
 	test_2d.fillStyle.parse.rgb-num.html \
 	test_2d.fillStyle.parse.rgb-clamp-1.html \
 	test_2d.fillStyle.parse.rgb-clamp-2.html \
+	test_2d.fillStyle.parse.rgb-clamp-3.html \
+	test_2d.fillStyle.parse.rgb-clamp-4.html \
+	test_2d.fillStyle.parse.rgb-clamp-5.html \
 	test_2d.fillStyle.parse.rgb-percent.html \
 	test_2d.fillStyle.parse.rgba-solid-1.html \
 	test_2d.fillStyle.parse.rgba-solid-2.html \
@@ -212,8 +269,18 @@ _TEST_FILES_B = \
 	test_2d.fillStyle.parse.hsl-3.html \
 	test_2d.fillStyle.parse.hsl-4.html \
 	test_2d.fillStyle.parse.hsl-5.html \
+	test_2d.fillStyle.parse.hsl-clamp-1.html \
+	test_2d.fillStyle.parse.hsl-clamp-2.html \
+	test_2d.fillStyle.parse.hsl-clamp-3.html \
+	test_2d.fillStyle.parse.hsl-clamp-4.html \
 	test_2d.fillStyle.parse.hsla-1.html \
 	test_2d.fillStyle.parse.hsla-2.html \
+	test_2d.fillStyle.parse.hsla-clamp-1.html \
+	test_2d.fillStyle.parse.hsla-clamp-2.html \
+	test_2d.fillStyle.parse.hsla-clamp-3.html \
+	test_2d.fillStyle.parse.hsla-clamp-4.html \
+	test_2d.fillStyle.parse.hsla-clamp-5.html \
+	test_2d.fillStyle.parse.hsla-clamp-6.html \
 	test_2d.fillStyle.parse.svg-1.html \
 	test_2d.fillStyle.parse.svg-2.html \
 	test_2d.fillStyle.parse.invalid.hex3.html \
@@ -222,6 +289,9 @@ _TEST_FILES_B = \
 	test_2d.fillStyle.parse.invalid.rgb-2.html \
 	test_2d.fillStyle.parse.invalid.rgb-3.html \
 	test_2d.fillStyle.parse.invalid.rgb-4.html \
+	test_2d.fillStyle.parse.invalid.rgb-5.html \
+	test_2d.fillStyle.parse.invalid.rgb-6.html \
+	test_2d.fillStyle.parse.invalid.rgb-7.html \
 	test_2d.fillStyle.parse.invalid.rgba-1.html \
 	test_2d.fillStyle.parse.invalid.rgba-2.html \
 	test_2d.fillStyle.parse.invalid.rgba-3.html \
@@ -231,8 +301,13 @@ _TEST_FILES_B = \
 	test_2d.fillStyle.parse.invalid.hsl-2.html \
 	test_2d.fillStyle.parse.invalid.hsl-3.html \
 	test_2d.fillStyle.parse.invalid.hsl-4.html \
+	test_2d.fillStyle.parse.invalid.hsl-5.html \
+	test_2d.fillStyle.parse.invalid.hsla-1.html \
+	test_2d.fillStyle.parse.invalid.hsla-2.html \
 	test_2d.fillStyle.parse.system.html \
-	test_2d.fillStyle.parse.flavor.html \
+	test_2d.fillStyle.parse.current.basic.html \
+	test_2d.fillStyle.parse.current.changed.html \
+	test_2d.fillStyle.parse.current.removed.html \
 	test_2d.fillStyle.invalidstring.html \
 	test_2d.fillStyle.invalidtype.html \
 	test_2d.fillStyle.get.solid.html \
@@ -240,6 +315,7 @@ _TEST_FILES_B = \
 	test_2d.fillStyle.get.transparent.html \
 	test_2d.fillStyle.default.html \
 	test_2d.strokeStyle.default.html \
+	test_2d.gradient.object.type.html \
 	test_2d.gradient.object.return.html \
 	test_2d.gradient.interpolate.solid.html \
 	test_2d.gradient.interpolate.colour.html \
@@ -251,27 +327,32 @@ _TEST_FILES_B = \
 	test_2d.gradient.interpolate.multiple.html \
 	test_2d.gradient.interpolate.overlap.html \
 	test_2d.gradient.interpolate.overlap2.html \
+	test_2d.gradient.empty.html \
 	test_2d.gradient.object.update.html \
 	test_2d.gradient.object.compare.html \
 	test_2d.gradient.object.crosscanvas.html \
 	test_2d.gradient.object.invalidoffset.html \
 	test_2d.gradient.object.invalidcolour.html \
+	test_2d.gradient.linear.nonfinite.html \
+	test_2d.gradient.linear.transform.1.html \
+	test_2d.gradient.linear.transform.2.html \
+	test_2d.gradient.linear.transform.3.html \
+	test_2d.gradient.radial.negative.html \
+	test_2d.gradient.radial.nonfinite.html \
+	test_2d.gradient.radial.inside1.html \
 	$(NULL)
 
-_TEST_FILES_C = \
-	test_2d.gradient.radial.negative.html \
-	test_2d.gradient.radial.invalid.html \
-	test_2d.gradient.radial.inside1.html \
-	test_2d.gradient.radial.inside2.html \
-	test_2d.gradient.radial.outside1.html \
-	test_2d.gradient.radial.cone.front.html \
+_TEST_FILES_3 = \
 	test_2d.gradient.radial.cone.bottom.html \
-	test_2d.gradient.radial.cone.top.html \
 	test_2d.gradient.radial.cone.cylinder.html \
 	test_2d.gradient.radial.cone.shape1.html \
+	test_2d.gradient.radial.transform.1.html \
+	test_2d.gradient.radial.transform.2.html \
+	test_2d.gradient.radial.transform.3.html \
 	test_2d.pattern.basic.type.html \
 	test_2d.pattern.basic.image.html \
 	test_2d.pattern.basic.canvas.html \
+	test_2d.pattern.basic.zerocanvas.html \
 	test_2d.pattern.basic.nocontext.html \
 	test_2d.pattern.image.undefined.html \
 	test_2d.pattern.image.null.html \
@@ -281,7 +362,6 @@ _TEST_FILES_C = \
 	test_2d.pattern.repeat.empty.html \
 	test_2d.pattern.repeat.null.html \
 	test_2d.pattern.repeat.undefined.html \
-	test_2d.pattern.repeat.missing.html \
 	test_2d.pattern.repeat.unrecognised.html \
 	test_2d.pattern.repeat.case.html \
 	test_2d.pattern.repeat.nullsuffix.html \
@@ -294,7 +374,7 @@ _TEST_FILES_C = \
 	test_2d.pattern.paint.norepeat.outside.html \
 	test_2d.pattern.paint.norepeat.coord1.html \
 	test_2d.pattern.paint.norepeat.coord2.html \
-	test_2d.pattern.paint.coord3.html \
+	test_2d.pattern.paint.norepeat.coord3.html \
 	test_2d.pattern.paint.repeat.basic.html \
 	test_2d.pattern.paint.repeat.outside.html \
 	test_2d.pattern.paint.repeat.coord1.html \
@@ -306,77 +386,106 @@ _TEST_FILES_C = \
 	test_2d.pattern.paint.repeaty.basic.html \
 	test_2d.pattern.paint.repeaty.outside.html \
 	test_2d.pattern.paint.repeaty.coord1.html \
+	test_2d.pattern.paint.orientation.image.html \
+	test_2d.pattern.paint.orientation.canvas.html \
+	test_2d.pattern.animated.gif.html \
 	test_2d.line.defaults.html \
-	test_2d.line.invalid.lineWidth.html \
-	test_2d.line.invalid.miterLimit.html \
-	test_2d.line.lineWidth.basic.html \
-	test_2d.line.lineWidth.transformed.html \
-	test_2d.line.lineCap.butt.html \
-	test_2d.line.lineCap.round.html \
-	test_2d.line.lineCap.square.html \
-	test_2d.line.lineJoin.bevel.html \
-	test_2d.line.lineJoin.round.html \
-	test_2d.line.lineJoin.miter.html \
+	test_2d.line.width.basic.html \
+	test_2d.line.width.transformed.html \
+	test_2d.line.width.invalid.html \
+	test_2d.line.cap.butt.html \
+	test_2d.line.cap.round.html \
+	test_2d.line.cap.square.html \
+	test_2d.line.cap.open.html \
+	test_2d.line.cap.invalid.html \
+	test_2d.line.join.bevel.html \
+	test_2d.line.join.round.html \
+	test_2d.line.join.miter.html \
 	test_2d.line.join.open.html \
 	test_2d.line.join.closed.html \
-	test_2d.line.join.zeroline.join.html \
-	test_2d.line.cap.open.html \
-	test_2d.line.cap.zeroline.round.html \
-	test_2d.line.cap.zeroline.square.html \
+	test_2d.line.join.invalid.html \
 	test_2d.line.miter.exceeded.html \
+	test_2d.line.miter.acute.html \
+	test_2d.line.miter.obtuse.html \
 	test_2d.line.miter.rightangle.html \
 	test_2d.line.miter.lineedge.html \
+	test_2d.line.miter.within.html \
+	test_2d.line.miter.invalid.html \
 	test_2d.line.cross.html \
 	test_2d.line.union.html \
 	test_2d.clearRect.basic.html \
 	test_2d.clearRect.path.html \
 	test_2d.clearRect.zero.html \
+	test_2d.clearRect.negative.html \
 	test_2d.clearRect.transform.html \
 	test_2d.clearRect.globalalpha.html \
 	test_2d.clearRect.globalcomposite.html \
 	test_2d.clearRect.clip.html \
 	test_2d.clearRect.shadow.html \
-	test_2d.fillRect.negative.html \
+	test_2d.clearRect.nonfinite.html \
 	test_2d.fillRect.basic.html \
 	test_2d.fillRect.path.html \
 	test_2d.fillRect.zero.html \
+	test_2d.fillRect.negative.html \
 	test_2d.fillRect.transform.html \
 	test_2d.fillRect.clip.html \
 	test_2d.fillRect.shadow.html \
-	test_2d.strokeRect.negative.html \
+	$(NULL)
+
+_TEST_FILES_4 = \
+	test_2d.fillRect.nonfinite.html \
 	test_2d.strokeRect.basic.html \
 	test_2d.strokeRect.path.html \
 	test_2d.strokeRect.zero.1.html \
 	test_2d.strokeRect.zero.2.html \
 	test_2d.strokeRect.zero.3.html \
 	test_2d.strokeRect.zero.4.html \
+	test_2d.strokeRect.negative.html \
 	test_2d.strokeRect.transform.html \
 	test_2d.strokeRect.globalalpha.html \
 	test_2d.strokeRect.globalcomposite.html \
 	test_2d.strokeRect.clip.html \
 	test_2d.strokeRect.shadow.html \
-	$(NULL)
-
-_TEST_FILES_D = \
+	test_2d.strokeRect.nonfinite.html \
 	test_2d.path.initial.html \
 	test_2d.path.beginPath.html \
 	test_2d.path.moveTo.basic.html \
 	test_2d.path.moveTo.newsubpath.html \
 	test_2d.path.moveTo.multiple.html \
+	test_2d.path.moveTo.nonfinite.html \
 	test_2d.path.closePath.empty.html \
 	test_2d.path.closePath.newline.html \
 	test_2d.path.closePath.nextpoint.html \
 	test_2d.path.lineTo.emptysubpath.html \
 	test_2d.path.lineTo.basic.html \
 	test_2d.path.lineTo.nextpoint.html \
+	test_2d.path.lineTo.nonfinite.html \
 	test_2d.path.quadraticCurveTo.emptysubpath.html \
 	test_2d.path.quadraticCurveTo.basic.html \
 	test_2d.path.quadraticCurveTo.shape.html \
 	test_2d.path.quadraticCurveTo.scaled.html \
+	test_2d.path.quadraticCurveTo.nonfinite.html \
 	test_2d.path.bezierCurveTo.emptysubpath.html \
 	test_2d.path.bezierCurveTo.basic.html \
 	test_2d.path.bezierCurveTo.shape.html \
 	test_2d.path.bezierCurveTo.scaled.html \
+	test_2d.path.bezierCurveTo.nonfinite.html \
+	test_2d.path.arcTo.emptysubpath.html \
+	test_2d.path.arcTo.coincide.1.html \
+	test_2d.path.arcTo.coincide.2.html \
+	test_2d.path.arcTo.collinear.1.html \
+	test_2d.path.arcTo.collinear.2.html \
+	test_2d.path.arcTo.collinear.3.html \
+	test_2d.path.arcTo.shape.curve1.html \
+	test_2d.path.arcTo.shape.curve2.html \
+	test_2d.path.arcTo.shape.start.html \
+	test_2d.path.arcTo.shape.end.html \
+	test_2d.path.arcTo.negative.html \
+	test_2d.path.arcTo.zero.1.html \
+	test_2d.path.arcTo.zero.2.html \
+	test_2d.path.arcTo.transformation.html \
+	test_2d.path.arcTo.scale.html \
+	test_2d.path.arcTo.nonfinite.html \
 	test_2d.path.arc.empty.html \
 	test_2d.path.arc.nonempty.html \
 	test_2d.path.arc.end.html \
@@ -384,21 +493,25 @@ _TEST_FILES_D = \
 	test_2d.path.arc.angle.2.html \
 	test_2d.path.arc.angle.3.html \
 	test_2d.path.arc.angle.4.html \
+	test_2d.path.arc.angle.5.html \
+	test_2d.path.arc.angle.6.html \
 	test_2d.path.arc.zero.1.html \
 	test_2d.path.arc.zero.2.html \
-	test_2d.path.arc.zero.3.html \
-	test_2d.path.arc.zero.4.html \
-	test_2d.path.arc.zero.5.html \
-	test_2d.path.arc.zero.6.html \
+	test_2d.path.arc.twopie.1.html \
+	test_2d.path.arc.twopie.2.html \
+	test_2d.path.arc.twopie.3.html \
+	test_2d.path.arc.twopie.4.html \
 	test_2d.path.arc.shape.1.html \
 	test_2d.path.arc.shape.2.html \
-	test_2d.path.arc.shape.3.html \
 	test_2d.path.arc.shape.4.html \
 	test_2d.path.arc.shape.5.html \
 	test_2d.path.arc.selfintersect.1.html \
 	test_2d.path.arc.selfintersect.2.html \
 	test_2d.path.arc.negative.html \
-	test_2d.path.arc.zero.html \
+	test_2d.path.arc.zeroradius.html \
+	test_2d.path.arc.scale.1.html \
+	test_2d.path.arc.scale.2.html \
+	test_2d.path.arc.nonfinite.html \
 	test_2d.path.rect.basic.html \
 	test_2d.path.rect.newsubpath.html \
 	test_2d.path.rect.closed.html \
@@ -410,18 +523,34 @@ _TEST_FILES_D = \
 	test_2d.path.rect.zero.4.html \
 	test_2d.path.rect.zero.5.html \
 	test_2d.path.rect.negative.html \
+	test_2d.path.rect.winding.html \
+	test_2d.path.rect.nonfinite.html \
+	test_2d.path.fill.overlap.html \
 	test_2d.path.fill.winding.add.html \
 	test_2d.path.fill.winding.subtract.1.html \
 	test_2d.path.fill.winding.subtract.2.html \
+	$(NULL)
+
+_TEST_FILES_5 = \
 	test_2d.path.fill.winding.subtract.3.html \
 	test_2d.path.fill.closed.basic.html \
 	test_2d.path.fill.closed.unaffected.html \
+	test_2d.path.stroke.overlap.html \
 	test_2d.path.stroke.union.html \
 	test_2d.path.stroke.unaffected.html \
+	test_2d.path.stroke.scale1.html \
+	test_2d.path.stroke.scale2.html \
+	test_2d.path.stroke.skew.html \
+	test_2d.path.stroke.empty.html \
+	test_2d.path.stroke.prune.line.html \
+	test_2d.path.stroke.prune.closed.html \
+	test_2d.path.stroke.prune.curve.html \
+	test_2d.path.stroke.prune.arc.html \
+	test_2d.path.stroke.prune.rect.html \
+	test_2d.path.stroke.prune.corner.html \
 	test_2d.path.transformation.basic.html \
-	test_2d.path.transformation.multiple.1.html \
-	test_2d.path.transformation.multiple.2.html \
-	test_2d.path.transformation.multiple.3.html \
+	test_2d.path.transformation.multiple.html \
+	test_2d.path.transformation.changing.html \
 	test_2d.path.clip.empty.html \
 	test_2d.path.clip.basic.1.html \
 	test_2d.path.clip.basic.2.html \
@@ -431,12 +560,19 @@ _TEST_FILES_D = \
 	test_2d.path.clip.unaffected.html \
 	test_2d.path.isPointInPath.basic.1.html \
 	test_2d.path.isPointInPath.basic.2.html \
+	test_2d.path.isPointInPath.edge.html \
 	test_2d.path.isPointInPath.empty.html \
+	test_2d.path.isPointInPath.subpath.html \
+	test_2d.path.isPointInPath.outside.html \
 	test_2d.path.isPointInPath.unclosed.html \
+	test_2d.path.isPointInPath.arc.html \
+	test_2d.path.isPointInPath.bigarc.html \
+	test_2d.path.isPointInPath.bezier.html \
 	test_2d.path.isPointInPath.winding.html \
 	test_2d.path.isPointInPath.transform.1.html \
 	test_2d.path.isPointInPath.transform.2.html \
 	test_2d.path.isPointInPath.transform.3.html \
+	test_2d.path.isPointInPath.nonfinite.html \
 	test_2d.drawImage.3arg.html \
 	test_2d.drawImage.5arg.html \
 	test_2d.drawImage.9arg.basic.html \
@@ -444,6 +580,9 @@ _TEST_FILES_D = \
 	test_2d.drawImage.9arg.sourcesize.html \
 	test_2d.drawImage.9arg.destpos.html \
 	test_2d.drawImage.9arg.destsize.html \
+	test_2d.drawImage.canvas.html \
+	test_2d.drawImage.self.1.html \
+	test_2d.drawImage.self.2.html \
 	test_2d.drawImage.null.html \
 	test_2d.drawImage.wrongtype.html \
 	test_2d.drawImage.floatsource.html \
@@ -453,116 +592,236 @@ _TEST_FILES_D = \
 	test_2d.drawImage.outsidesource.html \
 	test_2d.drawImage.incomplete.html \
 	test_2d.drawImage.broken.html \
+	test_2d.drawImage.animated.gif.html \
+	test_2d.drawImage.animated.apng.html \
+	test_2d.drawImage.animated.poster.html \
 	test_2d.drawImage.path.html \
 	test_2d.drawImage.transform.html \
 	test_2d.drawImage.alpha.html \
 	test_2d.drawImage.clip.html \
 	test_2d.drawImage.composite.html \
-	test_2d.drawImage.self.html \
-	$(NULL)
-
-_TEST_FILES_E = \
+	test_2d.drawImage.nowrap.html \
+	test_2d.drawImage.nonfinite.html \
+	test_2d.imageData.create.basic.html \
+	test_2d.imageData.create.type.html \
+	test_2d.imageData.create.initial.html \
+	test_2d.imageData.create.large.html \
+	test_2d.imageData.create.tiny.html \
+	test_2d.imageData.create.negative.html \
+	test_2d.imageData.create.zero.html \
+	test_2d.imageData.create.nonfinite.html \
+	test_2d.imageData.create.round.html \
 	test_2d.imageData.get.basic.html \
-	test_2d.imageData.get.sourcepos.html \
-	test_2d.imageData.get.values.html \
-	test_2d.imageData.get.sourcesize.html \
-	test_2d.imageData.get.properties.html \
+	test_2d.imageData.get.type.html \
+	test_2d.imageData.get.zero.html \
+	test_2d.imageData.get.nonfinite.html \
+	test_2d.imageData.get.source.outside.html \
+	test_2d.imageData.get.source.negative.html \
+	test_2d.imageData.get.source.size.html \
+	test_2d.imageData.get.tiny.html \
 	test_2d.imageData.get.nonpremul.html \
+	test_2d.imageData.get.range.html \
+	test_2d.imageData.get.clamp.html \
 	test_2d.imageData.get.order.cols.html \
 	test_2d.imageData.get.order.rows.html \
 	test_2d.imageData.get.order.rgb.html \
 	test_2d.imageData.get.order.alpha.html \
-	test_2d.imageData.get.smallest.html \
-	test_2d.imageData.get.nonpositive.html \
-	test_2d.imageData.get.nonfinite.html \
+	test_2d.imageData.get.unaffected.html \
+	test_2d.imageData.object.properties.html \
+	test_2d.imageData.object.readonly.html \
+	test_2d.imageData.object.ctor.html \
+	test_2d.imageData.object.set.html \
+	test_2d.imageData.object.undefined.html \
+	$(NULL)
+
+_TEST_FILES_6 = \
+	test_2d.imageData.object.nan.html \
+	test_2d.imageData.object.string.html \
+	test_2d.imageData.object.clamp.html \
+	test_2d.imageData.object.round.html \
+	test_2d.imageData.put.null.html \
+	test_2d.imageData.put.nonfinite.html \
 	test_2d.imageData.put.basic.html \
+	test_2d.imageData.put.created.html \
+	test_2d.imageData.put.wrongtype.html \
+	test_2d.imageData.put.cross.html \
 	test_2d.imageData.put.alpha.html \
 	test_2d.imageData.put.modified.html \
-	test_2d.imageData.put.type.correct.html \
-	test_2d.imageData.put.type.onepixel.html \
-	test_2d.imageData.put.type.extra.html \
-	test_2d.imageData.put.type.missing.html \
-	test_2d.imageData.put.type.invalidsize.html \
-	test_2d.imageData.put.type.invalidvalues.html \
+	test_2d.imageData.put.dirty.zero.html \
+	test_2d.imageData.put.dirty.rect1.html \
+	test_2d.imageData.put.dirty.rect2.html \
+	test_2d.imageData.put.dirty.negative.html \
+	test_2d.imageData.put.dirty.outside.html \
 	test_2d.imageData.put.unchanged.html \
 	test_2d.imageData.put.unaffected.html \
+	test_2d.imageData.put.clip.html \
 	test_2d.imageData.put.path.html \
+	test_2d.shadow.attributes.shadowBlur.1.html \
+	test_2d.shadow.attributes.shadowBlur.2.html \
+	test_2d.shadow.attributes.shadowOffset.1.html \
+	test_2d.shadow.attributes.shadowOffset.2.html \
+	test_2d.shadow.attributes.shadowColor.1.html \
+	test_2d.shadow.attributes.shadowColor.2.html \
+	test_2d.shadow.basic.1.html \
+	test_2d.shadow.basic.2.html \
+	test_2d.shadow.offset.positiveX.html \
+	test_2d.shadow.offset.negativeX.html \
+	test_2d.shadow.offset.positiveY.html \
+	test_2d.shadow.offset.negativeY.html \
+	test_2d.shadow.outside.html \
+	test_2d.shadow.clip.1.html \
+	test_2d.shadow.clip.2.html \
+	test_2d.shadow.clip.3.html \
+	test_2d.shadow.stroke.basic.html \
+	test_2d.shadow.stroke.cap.1.html \
+	test_2d.shadow.stroke.cap.2.html \
+	test_2d.shadow.stroke.join.1.html \
+	test_2d.shadow.stroke.join.2.html \
+	test_2d.shadow.stroke.join.3.html \
+	test_2d.shadow.image.basic.html \
+	test_2d.shadow.image.transparent.1.html \
+	test_2d.shadow.image.transparent.2.html \
+	test_2d.shadow.image.alpha.html \
+	test_2d.shadow.image.section.html \
+	test_2d.shadow.image.scale.html \
+	test_2d.shadow.canvas.basic.html \
+	test_2d.shadow.canvas.transparent.1.html \
+	test_2d.shadow.canvas.transparent.2.html \
+	test_2d.shadow.canvas.alpha.html \
+	test_2d.shadow.pattern.basic.html \
+	test_2d.shadow.pattern.transparent.1.html \
+	test_2d.shadow.pattern.transparent.2.html \
+	test_2d.shadow.pattern.alpha.html \
+	test_2d.shadow.gradient.basic.html \
+	test_2d.shadow.gradient.transparent.1.html \
+	test_2d.shadow.gradient.transparent.2.html \
+	test_2d.shadow.gradient.alpha.html \
+	test_2d.shadow.transform.1.html \
+	test_2d.shadow.transform.2.html \
+	test_2d.shadow.blur.low.html \
+	test_2d.shadow.blur.high.html \
+	test_2d.shadow.alpha.1.html \
+	test_2d.shadow.alpha.2.html \
+	test_2d.shadow.alpha.3.html \
+	test_2d.shadow.alpha.4.html \
+	test_2d.shadow.alpha.5.html \
+	test_2d.shadow.composite.1.html \
+	test_2d.shadow.composite.2.html \
+	test_2d.shadow.composite.3.html \
+	test_2d.shadow.composite.4.html \
 	test_bug397524.html \
 	test_bug405982.html \
-	image_transparent50.png \
-	image_redtransparent.png \
-	image_yellow.png \
-	image_green-16x16.png \
-	image_red-16x16.png \
-	image_green-1x1.png \
-	image_green-redirect \
-	image_green-redirect^headers^ \
-	image_ggrr-256x256.png \
-	image_yellow75.png \
-	image_broken.png \
-	image_rgrg-256x256.png \
-	image_red.png \
-	image_transparent.png \
-	image_green.png \
 	test_text.font.html \
 	test_text.textAlign.html \
 	test_text.textBaseline.html \
 	test_text.measure.html \
 	test_text.space.replace.html \
+	image_transparent50.png \
+	image_redtransparent.png \
+	image_yellow.png \
+	image_anim-poster-gr.png \
+	image_green-16x16.png \
+	image_red-16x16.png \
+	image_green-1x1.png \
+	image_ggrr-256x256.png \
+	image_yellow75.png \
+	image_anim-gr.gif \
+	image_rrgg-256x256.png \
+	image_broken.png \
+	image_anim-gr.png \
+	image_rgrg-256x256.png \
+	image_red.png \
+	image_transparent.png \
+	image_green.png \
+	image_green-redirect \
+	image_green-redirect^headers^ \
 	$(NULL)
 
-# This one test crashes Mac for now.  Bug 407104
-ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-_TEST_FILES_E += \
-	test_2d.gradient.empty.html \
-	$(NULL)
-endif
-
 # Tests that fail on Mac (possibly because spec is underdefined?).  Bug 407105
 ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 # XXX vlad don't test these anywhere, cairo behaviour changed
-#_TEST_FILES_E += \
-#	test_2d.line.join.parallel.html \
-#	test_2d.strokeRect.zero.5.html \
-#	test_2d.line.join.zeroline.corner.html \
-#	test_2d.line.miter.within.html \
-#	$(NULL)
+_TEST_FILES_3 += \
+	test_2d.line.join.parallel.html \
+	test_2d.strokeRect.zero.5.html \
+	$(NULL)
 
 # This is an issue with Quartz's handling of radial gradients and some numeric
 # imprecision that results in errors here.
-_TEST_FILES_D += test_2d.gradient.radial.inside3.html
+_TEST_FILES_2 += \
+	test_2d.gradient.radial.inside2.html \
+	test_2d.gradient.radial.inside3.html \
+	test_2d.gradient.radial.outside1.html \
+	$(NULL)
+
+_TEST_FILES_3 += \
+	test_2d.gradient.radial.cone.front.html \
+	test_2d.gradient.radial.cone.top.html \
+	$(NULL)
 
 # This is another Quartz bug -- closed paths that don't lie fully within the
 # destination bounds seem to have problems with the BEVEL/SQUARE join/cap combo.
 # The joins are rendered as if with MITER; the correct behaviour is also seen
 # if BUTT is used instead of SQUARE.
-_TEST_FILES_D += test_2d.line.cap.closed.html
+_TEST_FILES_4 += test_2d.line.cap.closed.html
 
-# test_2d.line.cap.zerobezier.round.html disabled for now, from above
 endif
 
 # Tests that fail on non-Mac (bug 407107)
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-_TEST_FILES_E += \
-	test_2d.path.rect.selfintersect.html \
+
+# still need bug numbers
+_TEST_FILES_1 += \
+	test_2d.composite.uncovered.fill.source-in.html \
+	test_2d.composite.uncovered.fill.destination-in.html \
+	test_2d.composite.uncovered.fill.source-out.html \
+	test_2d.composite.uncovered.fill.destination-atop.html \
+	test_2d.composite.uncovered.pattern.source-in.html \
+	test_2d.composite.uncovered.pattern.destination-in.html \
+	test_2d.composite.uncovered.pattern.source-out.html \
+	test_2d.composite.uncovered.pattern.destination-atop.html \
 	$(NULL)
+
+# still need bug numbers
+_TEST_FILES_3 += \
+	test_2d.gradient.radial.outside2.html \
+	test_2d.gradient.radial.outside3.html \
+	test_2d.gradient.radial.touch1.html \
+	test_2d.gradient.radial.touch2.html \
+	test_2d.gradient.radial.touch3.html \
+	test_2d.gradient.radial.equal.html \
+	test_2d.gradient.radial.cone.shape2.html \
+	test_2d.gradient.radial.cone.behind.html \
+	test_2d.gradient.radial.cone.beside.html \
+	$(NULL)
+
+# still need bug numbers
+_TEST_FILES_4 += test_2d.path.arc.shape.3.html
+
+_TEST_FILES_5 += test_2d.path.rect.selfintersect.html
 endif
 
 # This test is bogus according to the spec; see bug 407107
 # test_2d.path.rect.zero.6.html
 
 # split up into groups to work around command-line length limits
-libs:: $(_TEST_FILES_A)
+libs:: $(_TEST_FILES_0)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 
-libs:: $(_TEST_FILES_B)
+libs:: $(_TEST_FILES_1)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 
-libs:: $(_TEST_FILES_C)
+libs:: $(_TEST_FILES_2)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 
-libs:: $(_TEST_FILES_D)
+libs:: $(_TEST_FILES_3)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 
-libs:: $(_TEST_FILES_E)
+libs:: $(_TEST_FILES_4)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
+
+libs:: $(_TEST_FILES_5)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
+
+libs:: $(_TEST_FILES_6)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
+
diff --git a/content/canvas/test/image_anim-gr.gif b/content/canvas/test/image_anim-gr.gif
new file mode 100644
index 000000000000..45263e0afba7
Binary files /dev/null and b/content/canvas/test/image_anim-gr.gif differ
diff --git a/content/canvas/test/image_anim-gr.png b/content/canvas/test/image_anim-gr.png
new file mode 100644
index 000000000000..925e2efc9a97
Binary files /dev/null and b/content/canvas/test/image_anim-gr.png differ
diff --git a/content/canvas/test/image_anim-poster-gr.png b/content/canvas/test/image_anim-poster-gr.png
new file mode 100644
index 000000000000..6941207373e5
Binary files /dev/null and b/content/canvas/test/image_anim-poster-gr.png differ
diff --git a/content/canvas/test/image_rrgg-256x256.png b/content/canvas/test/image_rrgg-256x256.png
new file mode 100644
index 000000000000..7f6351565473
Binary files /dev/null and b/content/canvas/test/image_rrgg-256x256.png differ
diff --git a/content/canvas/test/test_2d.canvas.readonly.html b/content/canvas/test/test_2d.canvas.readonly.html
index a42bd70caa45..483b9425665f 100644
--- a/content/canvas/test/test_2d.canvas.readonly.html
+++ b/content/canvas/test/test_2d.canvas.readonly.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.canvas.readonly</title>
+<!-- Testing: CanvasRenderingContext2D.canvas is readonly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,10 +16,12 @@ var ctx = canvas.getContext('2d');
 
 var c = document.createElement('canvas');
 var d = ctx.canvas;
-try { ctx.canvas = c; } catch (e) {} // not specified whether this throws, I think
+ok(c !== d, "c !== d");
+try { ctx.canvas = c; } catch (e) {} // not sure whether this should throw or not...
 ok(ctx.canvas === d, "ctx.canvas === d");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.canvas.reference.html b/content/canvas/test/test_2d.canvas.reference.html
index 2ad2739eef99..6d746a60426c 100644
--- a/content/canvas/test/test_2d.canvas.reference.html
+++ b/content/canvas/test/test_2d.canvas.reference.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.canvas.reference</title>
+<!-- Testing: CanvasRenderingContext2D.canvas refers back to its canvas -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(ctx.canvas === canvas, "ctx.canvas === canvas");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.clearRect.basic.html b/content/canvas/test/test_2d.clearRect.basic.html
index 0f0c816daee8..a94747dfab36 100644
--- a/content/canvas/test/test_2d.clearRect.basic.html
+++ b/content/canvas/test/test_2d.clearRect.basic.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.clearRect.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -31,7 +30,8 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.clearRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.clearRect.clip.html b/content/canvas/test/test_2d.clearRect.clip.html
index a54dc45ed550..184533364f1a 100644
--- a/content/canvas/test/test_2d.clearRect.clip.html
+++ b/content/canvas/test/test_2d.clearRect.clip.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.clearRect.clip</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -40,7 +39,8 @@ ctx.fillRect(0, 0, 16, 16);
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.clearRect.globalalpha.html b/content/canvas/test/test_2d.clearRect.globalalpha.html
index 386db5f416a7..002fbdecab74 100644
--- a/content/canvas/test/test_2d.clearRect.globalalpha.html
+++ b/content/canvas/test/test_2d.clearRect.globalalpha.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.clearRect.globalalpha</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.globalAlpha = 0.1;
 ctx.clearRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.clearRect.globalcomposite.html b/content/canvas/test/test_2d.clearRect.globalcomposite.html
index 010fdf8ae805..ca84e75773e9 100644
--- a/content/canvas/test/test_2d.clearRect.globalcomposite.html
+++ b/content/canvas/test/test_2d.clearRect.globalcomposite.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.clearRect.globalcomposite</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.globalCompositeOperation = 'destination-atop';
 ctx.clearRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.clearRect.negative.html b/content/canvas/test/test_2d.clearRect.negative.html
new file mode 100644
index 000000000000..1c3f864fbdea
--- /dev/null
+++ b/content/canvas/test/test_2d.clearRect.negative.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.clearRect.negative</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.clearRect(0, 0, 50, 25);
+ctx.clearRect(100, 0, -50, 25);
+ctx.clearRect(0, 50, 50, -25);
+ctx.clearRect(100, 50, -50, -25);
+isPixel(ctx, 25,12, 0,0,0,0, "25,12", "0,0,0,0", 0);
+isPixel(ctx, 75,12, 0,0,0,0, "75,12", "0,0,0,0", 0);
+isPixel(ctx, 25,37, 0,0,0,0, "25,37", "0,0,0,0", 0);
+isPixel(ctx, 75,37, 0,0,0,0, "75,37", "0,0,0,0", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.clearRect.nonfinite.html b/content/canvas/test/test_2d.clearRect.nonfinite.html
new file mode 100644
index 000000000000..3da44c67bb42
--- /dev/null
+++ b/content/canvas/test/test_2d.clearRect.nonfinite.html
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.clearRect.nonfinite</title>
+<!-- Testing: clearRect() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.clearRect(Infinity, 0, 100, 50);
+ctx.clearRect(-Infinity, 0, 100, 50);
+ctx.clearRect(NaN, 0, 100, 50);
+ctx.clearRect(0, Infinity, 100, 50);
+ctx.clearRect(0, -Infinity, 100, 50);
+ctx.clearRect(0, NaN, 100, 50);
+ctx.clearRect(0, 0, Infinity, 50);
+ctx.clearRect(0, 0, -Infinity, 50);
+ctx.clearRect(0, 0, NaN, 50);
+ctx.clearRect(0, 0, 100, Infinity);
+ctx.clearRect(0, 0, 100, -Infinity);
+ctx.clearRect(0, 0, 100, NaN);
+ctx.clearRect(Infinity, Infinity, 100, 50);
+ctx.clearRect(Infinity, Infinity, Infinity, 50);
+ctx.clearRect(Infinity, Infinity, Infinity, Infinity);
+ctx.clearRect(Infinity, Infinity, 100, Infinity);
+ctx.clearRect(Infinity, 0, Infinity, 50);
+ctx.clearRect(Infinity, 0, Infinity, Infinity);
+ctx.clearRect(Infinity, 0, 100, Infinity);
+ctx.clearRect(0, Infinity, Infinity, 50);
+ctx.clearRect(0, Infinity, Infinity, Infinity);
+ctx.clearRect(0, Infinity, 100, Infinity);
+ctx.clearRect(0, 0, Infinity, Infinity);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.clearRect.path.html b/content/canvas/test/test_2d.clearRect.path.html
index 9879b4a6616a..c693008012b1 100644
--- a/content/canvas/test/test_2d.clearRect.path.html
+++ b/content/canvas/test/test_2d.clearRect.path.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.clearRect.path</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.clearRect(0, 0, 16, 16);
 ctx.fill();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.clearRect.shadow.html b/content/canvas/test/test_2d.clearRect.shadow.html
index d47b894ce732..3b6e621357d8 100644
--- a/content/canvas/test/test_2d.clearRect.shadow.html
+++ b/content/canvas/test/test_2d.clearRect.shadow.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.clearRect.shadow</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +34,8 @@ ctx.shadowOffsetY = 50;
 ctx.clearRect(0, -50, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.clearRect.transform.html b/content/canvas/test/test_2d.clearRect.transform.html
index 018ba4b28ff4..47793ab073ae 100644
--- a/content/canvas/test/test_2d.clearRect.transform.html
+++ b/content/canvas/test/test_2d.clearRect.transform.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.clearRect.transform</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.translate(0, 5);
 ctx.clearRect(0, -5, 10, 5);
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.clearRect.zero.html b/content/canvas/test/test_2d.clearRect.zero.html
index f0d57939bee8..e53d19e53c85 100644
--- a/content/canvas/test/test_2d.clearRect.zero.html
+++ b/content/canvas/test/test_2d.clearRect.zero.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.clearRect.zero</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.clearRect(0, 0, 0, 50);
 ctx.clearRect(0, 0, 0, 0);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.canvas.copy.html b/content/canvas/test/test_2d.composite.canvas.copy.html
new file mode 100644
index 000000000000..8e4594b1ba18
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.canvas.copy.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.canvas.copy</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.canvas.destination-atop.html b/content/canvas/test/test_2d.composite.canvas.destination-atop.html
new file mode 100644
index 000000000000..42e831fcdf9d
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.canvas.destination-atop.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.canvas.destination-atop</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 127,255,127,191, "50,25", "127,255,127,191", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.canvas.destination-in.html b/content/canvas/test/test_2d.composite.canvas.destination-in.html
new file mode 100644
index 000000000000..a059cfd6550b
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.canvas.destination-in.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.canvas.destination-in</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 0,255,255,95, "50,25", "0,255,255,95", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.canvas.destination-out.html b/content/canvas/test/test_2d.composite.canvas.destination-out.html
new file mode 100644
index 000000000000..3cb128310f20
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.canvas.destination-out.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.canvas.destination-out</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-out';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 0,255,255,31, "50,25", "0,255,255,31", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.canvas.destination-over.html b/content/canvas/test/test_2d.composite.canvas.destination-over.html
new file mode 100644
index 000000000000..50ebf97c9ed6
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.canvas.destination-over.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.canvas.destination-over</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-over';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 109,255,145,223, "50,25", "109,255,145,223", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.canvas.lighter.html b/content/canvas/test/test_2d.composite.canvas.lighter.html
new file mode 100644
index 000000000000..345f8bc462af
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.canvas.lighter.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.canvas.lighter</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'lighter';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 191,255,127,255, "50,25", "191,255,127,255", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.canvas.source-atop.html b/content/canvas/test/test_2d.composite.canvas.source-atop.html
new file mode 100644
index 000000000000..9547e84e5bc4
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.canvas.source-atop.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.canvas.source-atop</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-atop';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 191,255,63,127, "50,25", "191,255,63,127", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.canvas.source-in.html b/content/canvas/test/test_2d.composite.canvas.source-in.html
new file mode 100644
index 000000000000..001157d69701
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.canvas.source-in.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.canvas.source-in</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 255,255,0,95, "50,25", "255,255,0,95", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.canvas.source-out.html b/content/canvas/test/test_2d.composite.canvas.source-out.html
new file mode 100644
index 000000000000..bd241a367aa9
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.canvas.source-out.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.canvas.source-out</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 255,255,0,95, "50,25", "255,255,0,95", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.canvas.source-over.html b/content/canvas/test/test_2d.composite.canvas.source-over.html
new file mode 100644
index 000000000000..b72c57810e58
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.canvas.source-over.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.canvas.source-over</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-over';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 218,255,36,223, "50,25", "218,255,36,223", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.canvas.xor.html b/content/canvas/test/test_2d.composite.canvas.xor.html
new file mode 100644
index 000000000000..ac66ac0a639f
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.canvas.xor.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.canvas.xor</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 191,255,63,127, "50,25", "191,255,63,127", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.path.transformation.multiple.3.html b/content/canvas/test/test_2d.composite.clip.copy.html
similarity index 58%
rename from content/canvas/test/test_2d.path.transformation.multiple.3.html
rename to content/canvas/test/test_2d.composite.clip.copy.html
index 17a5b3685802..bc07eee822b2 100644
--- a/content/canvas/test/test_2d.path.transformation.multiple.3.html
+++ b/content/canvas/test/test_2d.composite.clip.copy.html
@@ -1,27 +1,24 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.path.transformation.multiple.3</title>
+<title>Canvas test: 2d.composite.clip.copy</title>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
-}
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -29,20 +26,19 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
 
-ctx.save();
-ctx.translate(100, 50);
-ctx.rect(0, 0, 100, 50);
-ctx.fill();
-ctx.restore();
 ctx.fillStyle = '#0f0';
-ctx.fill();
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
 
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.clip.destination-atop.html b/content/canvas/test/test_2d.composite.clip.destination-atop.html
new file mode 100644
index 000000000000..2b5855618e78
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.clip.destination-atop.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.clip.destination-atop</title>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.clip.destination-in.html b/content/canvas/test/test_2d.composite.clip.destination-in.html
new file mode 100644
index 000000000000..60a56d569956
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.clip.destination-in.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.clip.destination-in</title>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.clip.destination-out.html b/content/canvas/test/test_2d.composite.clip.destination-out.html
new file mode 100644
index 000000000000..0f79b712dba1
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.clip.destination-out.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.clip.destination-out</title>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-out';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.clip.destination-over.html b/content/canvas/test/test_2d.composite.clip.destination-over.html
new file mode 100644
index 000000000000..4e07f131d430
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.clip.destination-over.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.clip.destination-over</title>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-over';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.clip.lighter.html b/content/canvas/test/test_2d.composite.clip.lighter.html
new file mode 100644
index 000000000000..cfcecab69e14
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.clip.lighter.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.clip.lighter</title>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'lighter';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.clip.source-atop.html b/content/canvas/test/test_2d.composite.clip.source-atop.html
new file mode 100644
index 000000000000..8b0d677d9b3f
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.clip.source-atop.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.clip.source-atop</title>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-atop';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.clip.source-in.html b/content/canvas/test/test_2d.composite.clip.source-in.html
new file mode 100644
index 000000000000..7cfa4fc6fa70
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.clip.source-in.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.clip.source-in</title>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.clip.source-out.html b/content/canvas/test/test_2d.composite.clip.source-out.html
new file mode 100644
index 000000000000..7f13d4da5b12
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.clip.source-out.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.clip.source-out</title>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.clip.source-over.html b/content/canvas/test/test_2d.composite.clip.source-over.html
new file mode 100644
index 000000000000..37ce159f2df6
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.clip.source-over.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.clip.source-over</title>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-over';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.clip.xor.html b/content/canvas/test/test_2d.composite.clip.xor.html
new file mode 100644
index 000000000000..1fefc857a031
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.clip.xor.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.clip.xor</title>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.canvas.html b/content/canvas/test/test_2d.composite.globalAlpha.canvas.html
index dad1f47884c9..08983cc8b396 100644
--- a/content/canvas/test/test_2d.composite.globalAlpha.canvas.html
+++ b/content/canvas/test/test_2d.composite.globalAlpha.canvas.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.globalAlpha.canvas</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -39,7 +38,8 @@ ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
 ctx.drawImage(canvas2, 0, 0);
 isPixel(ctx, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.canvaspattern.html b/content/canvas/test/test_2d.composite.globalAlpha.canvaspattern.html
index 2f1d22a5b7f1..1510d42d17da 100644
--- a/content/canvas/test/test_2d.composite.globalAlpha.canvaspattern.html
+++ b/content/canvas/test/test_2d.composite.globalAlpha.canvaspattern.html
@@ -1,26 +1,34 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.globalAlpha.canvaspattern</title>
+<title>Canvas test: 2d.composite.globalAlpha.canvaspattern - bug 401790</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -43,7 +51,8 @@ ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
 ctx.fillRect(0, 0, 100, 50);
 todo_isPixel(ctx, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.default.html b/content/canvas/test/test_2d.composite.globalAlpha.default.html
index 6e73357121b1..4c11ac329b15 100644
--- a/content/canvas/test/test_2d.composite.globalAlpha.default.html
+++ b/content/canvas/test/test_2d.composite.globalAlpha.default.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.composite.globalAlpha.default</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +15,8 @@ var ctx = canvas.getContext('2d');
 
 ok(ctx.globalAlpha === 1.0, "ctx.globalAlpha === 1.0");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.fill.html b/content/canvas/test/test_2d.composite.globalAlpha.fill.html
index 5781338285b6..d5953564e131 100644
--- a/content/canvas/test/test_2d.composite.globalAlpha.fill.html
+++ b/content/canvas/test/test_2d.composite.globalAlpha.fill.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.globalAlpha.fill</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.image.html b/content/canvas/test/test_2d.composite.globalAlpha.image.html
index 98a49a5cbddb..1380c76b9955 100644
--- a/content/canvas/test/test_2d.composite.globalAlpha.image.html
+++ b/content/canvas/test/test_2d.composite.globalAlpha.image.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.globalAlpha.image</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
 ctx.drawImage(document.getElementById('red.png'), 0, 0);
 isPixel(ctx, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red.png" id="red.png" class="resource">
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.imagepattern.html b/content/canvas/test/test_2d.composite.globalAlpha.imagepattern.html
index cebb2621cb93..b03f7f5fc404 100644
--- a/content/canvas/test/test_2d.composite.globalAlpha.imagepattern.html
+++ b/content/canvas/test/test_2d.composite.globalAlpha.imagepattern.html
@@ -1,26 +1,34 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.globalAlpha.imagepattern</title>
+<title>Canvas test: 2d.composite.globalAlpha.imagepattern - bug 401790</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -36,7 +44,8 @@ ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
 ctx.fillRect(0, 0, 100, 50);
 todo_isPixel(ctx, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red.png" id="red.png" class="resource">
diff --git a/content/canvas/test/test_2d.line.invalid.lineWidth.html b/content/canvas/test/test_2d.composite.globalAlpha.invalid.html
similarity index 53%
rename from content/canvas/test/test_2d.line.invalid.lineWidth.html
rename to content/canvas/test/test_2d.composite.globalAlpha.invalid.html
index 17158055dfac..4f29f5511d95 100644
--- a/content/canvas/test/test_2d.line.invalid.lineWidth.html
+++ b/content/canvas/test/test_2d.composite.globalAlpha.invalid.html
@@ -1,12 +1,11 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.invalid.lineWidth</title>
+<title>Canvas test: 2d.composite.globalAlpha.invalid</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,36 +13,23 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-ctx.lineWidth = 1.5;
-ok(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
-
-ctx.lineWidth = 1.5;
-ctx.lineWidth = 0;
-todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
-
-ctx.lineWidth = 1.5;
-ctx.lineWidth = -1;
-todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
-
-ctx.lineWidth = 1.5;
+ctx.globalAlpha = 0.5;
+var a = ctx.globalAlpha; // might not be exactly 0.5, if it is rounded/quantised, so remember for future comparisons
 var _thrown = undefined; try {
-  ctx.lineWidth = Infinity;
+  ctx.globalAlpha = Infinity;
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-ok(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
-
-ctx.lineWidth = 1.5;
+ok(ctx.globalAlpha == a, "ctx.globalAlpha == a");
 var _thrown = undefined; try {
-  ctx.lineWidth = -Infinity;
+  ctx.globalAlpha = -Infinity;
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-ok(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
-
-ctx.lineWidth = 1.5;
+ok(ctx.globalAlpha == a, "ctx.globalAlpha == a");
 var _thrown = undefined; try {
-  ctx.lineWidth = NaN;
+  ctx.globalAlpha = NaN;
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-ok(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
+ok(ctx.globalAlpha == a, "ctx.globalAlpha == a");
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.range.html b/content/canvas/test/test_2d.composite.globalAlpha.range.html
index 0e60f9312f08..6df8b7c9341b 100644
--- a/content/canvas/test/test_2d.composite.globalAlpha.range.html
+++ b/content/canvas/test/test_2d.composite.globalAlpha.range.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.composite.globalAlpha.range</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -25,7 +24,8 @@ ok(ctx.globalAlpha == 0, "ctx.globalAlpha == 0");
 ctx.globalAlpha = 1;
 ok(ctx.globalAlpha == 1, "ctx.globalAlpha == 1");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.image.copy.html b/content/canvas/test/test_2d.composite.image.copy.html
index de781892fab2..8b67207dacae 100644
--- a/content/canvas/test/test_2d.composite.image.copy.html
+++ b/content/canvas/test/test_2d.composite.image.copy.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.image.copy</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.globalCompositeOperation = 'copy';
 ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
 isPixel(ctx, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_yellow75.png" id="yellow75.png" class="resource">
diff --git a/content/canvas/test/test_2d.composite.image.destination-atop.html b/content/canvas/test/test_2d.composite.image.destination-atop.html
index 8505213a69f1..2228d2271ba5 100644
--- a/content/canvas/test/test_2d.composite.image.destination-atop.html
+++ b/content/canvas/test/test_2d.composite.image.destination-atop.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.image.destination-atop</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.globalCompositeOperation = 'destination-atop';
 ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
 isPixel(ctx, 50,25, 127,255,127,191, "50,25", "127,255,127,191", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_yellow75.png" id="yellow75.png" class="resource">
diff --git a/content/canvas/test/test_2d.composite.image.destination-in.html b/content/canvas/test/test_2d.composite.image.destination-in.html
index ae4b40ca71a1..0cfc12e2ac2c 100644
--- a/content/canvas/test/test_2d.composite.image.destination-in.html
+++ b/content/canvas/test/test_2d.composite.image.destination-in.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.image.destination-in</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.globalCompositeOperation = 'destination-in';
 ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
 isPixel(ctx, 50,25, 0,255,255,95, "50,25", "0,255,255,95", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_yellow75.png" id="yellow75.png" class="resource">
diff --git a/content/canvas/test/test_2d.composite.image.destination-out.html b/content/canvas/test/test_2d.composite.image.destination-out.html
index 922de5359832..5e2ae467a6b9 100644
--- a/content/canvas/test/test_2d.composite.image.destination-out.html
+++ b/content/canvas/test/test_2d.composite.image.destination-out.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.image.destination-out</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.globalCompositeOperation = 'destination-out';
 ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
 isPixel(ctx, 50,25, 0,255,255,31, "50,25", "0,255,255,31", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_yellow75.png" id="yellow75.png" class="resource">
diff --git a/content/canvas/test/test_2d.composite.image.destination-over.html b/content/canvas/test/test_2d.composite.image.destination-over.html
index 2ba5dd83e20b..d2254b34de40 100644
--- a/content/canvas/test/test_2d.composite.image.destination-over.html
+++ b/content/canvas/test/test_2d.composite.image.destination-over.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.image.destination-over</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.globalCompositeOperation = 'destination-over';
 ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
 isPixel(ctx, 50,25, 109,255,145,223, "50,25", "109,255,145,223", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_yellow75.png" id="yellow75.png" class="resource">
diff --git a/content/canvas/test/test_2d.composite.image.lighter.html b/content/canvas/test/test_2d.composite.image.lighter.html
index 19a587df2056..5c8306fdc1d6 100644
--- a/content/canvas/test/test_2d.composite.image.lighter.html
+++ b/content/canvas/test/test_2d.composite.image.lighter.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.image.lighter</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.globalCompositeOperation = 'lighter';
 ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
 isPixel(ctx, 50,25, 191,255,127,255, "50,25", "191,255,127,255", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_yellow75.png" id="yellow75.png" class="resource">
diff --git a/content/canvas/test/test_2d.composite.image.source-atop.html b/content/canvas/test/test_2d.composite.image.source-atop.html
index 0e36fc69e747..4c671b0efa67 100644
--- a/content/canvas/test/test_2d.composite.image.source-atop.html
+++ b/content/canvas/test/test_2d.composite.image.source-atop.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.image.source-atop</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.globalCompositeOperation = 'source-atop';
 ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
 isPixel(ctx, 50,25, 191,255,63,127, "50,25", "191,255,63,127", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_yellow75.png" id="yellow75.png" class="resource">
diff --git a/content/canvas/test/test_2d.composite.image.source-in.html b/content/canvas/test/test_2d.composite.image.source-in.html
index c9fda2fc3c3a..fc3979a319ba 100644
--- a/content/canvas/test/test_2d.composite.image.source-in.html
+++ b/content/canvas/test/test_2d.composite.image.source-in.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.image.source-in</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.globalCompositeOperation = 'source-in';
 ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
 isPixel(ctx, 50,25, 255,255,0,95, "50,25", "255,255,0,95", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_yellow75.png" id="yellow75.png" class="resource">
diff --git a/content/canvas/test/test_2d.composite.image.source-out.html b/content/canvas/test/test_2d.composite.image.source-out.html
index b2b64404fd1e..bbe770a426e8 100644
--- a/content/canvas/test/test_2d.composite.image.source-out.html
+++ b/content/canvas/test/test_2d.composite.image.source-out.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.image.source-out</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.globalCompositeOperation = 'source-out';
 ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
 isPixel(ctx, 50,25, 255,255,0,95, "50,25", "255,255,0,95", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_yellow75.png" id="yellow75.png" class="resource">
diff --git a/content/canvas/test/test_2d.composite.image.source-over.html b/content/canvas/test/test_2d.composite.image.source-over.html
index 9dbd6bbeee1d..b067d6c0f423 100644
--- a/content/canvas/test/test_2d.composite.image.source-over.html
+++ b/content/canvas/test/test_2d.composite.image.source-over.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.image.source-over</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.globalCompositeOperation = 'source-over';
 ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
 isPixel(ctx, 50,25, 218,255,36,223, "50,25", "218,255,36,223", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_yellow75.png" id="yellow75.png" class="resource">
diff --git a/content/canvas/test/test_2d.composite.image.xor.html b/content/canvas/test/test_2d.composite.image.xor.html
index 0d9dce0bd801..083b4220d3ee 100644
--- a/content/canvas/test/test_2d.composite.image.xor.html
+++ b/content/canvas/test/test_2d.composite.image.xor.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.image.xor</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.globalCompositeOperation = 'xor';
 ctx.drawImage(document.getElementById('yellow75.png'), 0, 0);
 isPixel(ctx, 50,25, 191,255,63,127, "50,25", "191,255,63,127", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_yellow75.png" id="yellow75.png" class="resource">
diff --git a/content/canvas/test/test_2d.composite.operation.casesensitive.html b/content/canvas/test/test_2d.composite.operation.casesensitive.html
new file mode 100644
index 000000000000..84d44b5b8a37
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.operation.casesensitive.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.operation.casesensitive - bug 401788</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'Source-over';
+ok(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.operation.clear.html b/content/canvas/test/test_2d.composite.operation.clear.html
index 02359e5dc106..4ce3f51548d6 100644
--- a/content/canvas/test/test_2d.composite.operation.clear.html
+++ b/content/canvas/test/test_2d.composite.operation.clear.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.composite.operation.clear</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -18,7 +17,8 @@ ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'clear';
 todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.operation.darker.html b/content/canvas/test/test_2d.composite.operation.darker.html
index 913c492d709d..54935692db2a 100644
--- a/content/canvas/test/test_2d.composite.operation.darker.html
+++ b/content/canvas/test/test_2d.composite.operation.darker.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.composite.operation.darker</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -18,7 +17,8 @@ ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'darker';
 todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.operation.default.html b/content/canvas/test/test_2d.composite.operation.default.html
index a9cb85a0a304..b69c84f44d05 100644
--- a/content/canvas/test/test_2d.composite.operation.default.html
+++ b/content/canvas/test/test_2d.composite.operation.default.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.composite.operation.default</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +15,8 @@ var ctx = canvas.getContext('2d');
 
 ok(ctx.globalCompositeOperation == 'source-over', "ctx.globalCompositeOperation == 'source-over'");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.operation.get.html b/content/canvas/test/test_2d.composite.operation.get.html
index 46c862e9eecf..20fdb5961d5c 100644
--- a/content/canvas/test/test_2d.composite.operation.get.html
+++ b/content/canvas/test/test_2d.composite.operation.get.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.composite.operation.get</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -23,7 +22,8 @@ for (var i = 0; i < modes.length; ++i)
     ok(ctx.globalCompositeOperation == modes[i], "ctx.globalCompositeOperation == modes[\""+(i)+"\"]");
 }
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.operation.highlight.html b/content/canvas/test/test_2d.composite.operation.highlight.html
new file mode 100644
index 000000000000..3dd01c5b8e8f
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.operation.highlight.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.operation.highlight - bug 401788</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'highlight';
+ok(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.operation.nullsuffix.html b/content/canvas/test/test_2d.composite.operation.nullsuffix.html
new file mode 100644
index 000000000000..0be326f37e8d
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.operation.nullsuffix.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.operation.nullsuffix - bug 401788</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'source-over\0';
+ok(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.operation.over.html b/content/canvas/test/test_2d.composite.operation.over.html
index 7e8637c76769..8b59bdba2ad4 100644
--- a/content/canvas/test/test_2d.composite.operation.over.html
+++ b/content/canvas/test/test_2d.composite.operation.over.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.composite.operation.over</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -18,7 +17,8 @@ ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'over';
 todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.operation.unrecognised.html b/content/canvas/test/test_2d.composite.operation.unrecognised.html
new file mode 100644
index 000000000000..17a353787dc6
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.operation.unrecognised.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.operation.unrecognised - bug 401788</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'nonexistent';
+ok(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.solid.copy.html b/content/canvas/test/test_2d.composite.solid.copy.html
index efb732810225..7210117bc863 100644
--- a/content/canvas/test/test_2d.composite.solid.copy.html
+++ b/content/canvas/test/test_2d.composite.solid.copy.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.solid.copy</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.solid.destination-atop.html b/content/canvas/test/test_2d.composite.solid.destination-atop.html
index e794c42b4532..a4390005cc2c 100644
--- a/content/canvas/test/test_2d.composite.solid.destination-atop.html
+++ b/content/canvas/test/test_2d.composite.solid.destination-atop.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.solid.destination-atop</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.solid.destination-in.html b/content/canvas/test/test_2d.composite.solid.destination-in.html
index 70efd0ff678c..79673931278a 100644
--- a/content/canvas/test/test_2d.composite.solid.destination-in.html
+++ b/content/canvas/test/test_2d.composite.solid.destination-in.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.solid.destination-in</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.solid.destination-out.html b/content/canvas/test/test_2d.composite.solid.destination-out.html
index 0ebc07549f6c..2066549d2c96 100644
--- a/content/canvas/test/test_2d.composite.solid.destination-out.html
+++ b/content/canvas/test/test_2d.composite.solid.destination-out.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.solid.destination-out</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.solid.destination-over.html b/content/canvas/test/test_2d.composite.solid.destination-over.html
index f88b1fc1d59c..7bc711f8f2a4 100644
--- a/content/canvas/test/test_2d.composite.solid.destination-over.html
+++ b/content/canvas/test/test_2d.composite.solid.destination-over.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.solid.destination-over</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,255,255, "50,25", "0,255,255,255", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.solid.lighter.html b/content/canvas/test/test_2d.composite.solid.lighter.html
index 4aac53d5e7e4..dc2c3fb2a9ab 100644
--- a/content/canvas/test/test_2d.composite.solid.lighter.html
+++ b/content/canvas/test/test_2d.composite.solid.lighter.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.solid.lighter</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 255,255,255,255, "50,25", "255,255,255,255", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.solid.source-atop.html b/content/canvas/test/test_2d.composite.solid.source-atop.html
index 4f5cf396b990..db38549d34a2 100644
--- a/content/canvas/test/test_2d.composite.solid.source-atop.html
+++ b/content/canvas/test/test_2d.composite.solid.source-atop.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.solid.source-atop</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.solid.source-in.html b/content/canvas/test/test_2d.composite.solid.source-in.html
index 506663879d12..cd49a2c74df8 100644
--- a/content/canvas/test/test_2d.composite.solid.source-in.html
+++ b/content/canvas/test/test_2d.composite.solid.source-in.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.solid.source-in</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.solid.source-out.html b/content/canvas/test/test_2d.composite.solid.source-out.html
index fb6a85067662..4a09a0ec71d8 100644
--- a/content/canvas/test/test_2d.composite.solid.source-out.html
+++ b/content/canvas/test/test_2d.composite.solid.source-out.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.solid.source-out</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.solid.source-over.html b/content/canvas/test/test_2d.composite.solid.source-over.html
index b47a2da268fc..68260b77863e 100644
--- a/content/canvas/test/test_2d.composite.solid.source-over.html
+++ b/content/canvas/test/test_2d.composite.solid.source-over.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.solid.source-over</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 255,255,0,255, "50,25", "255,255,0,255", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.solid.xor.html b/content/canvas/test/test_2d.composite.solid.xor.html
new file mode 100644
index 000000000000..874524af805d
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.solid.xor.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.solid.xor</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.transparent.copy.html b/content/canvas/test/test_2d.composite.transparent.copy.html
index 7ef2826b9569..8e50eb9ec64a 100644
--- a/content/canvas/test/test_2d.composite.transparent.copy.html
+++ b/content/canvas/test/test_2d.composite.transparent.copy.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.transparent.copy</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,0,255,191, "50,25", "0,0,255,191", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.transparent.destination-atop.html b/content/canvas/test/test_2d.composite.transparent.destination-atop.html
index ce7caef5e400..6a7032df129b 100644
--- a/content/canvas/test/test_2d.composite.transparent.destination-atop.html
+++ b/content/canvas/test/test_2d.composite.transparent.destination-atop.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.transparent.destination-atop</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,127,127,191, "50,25", "0,127,127,191", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.transparent.destination-in.html b/content/canvas/test/test_2d.composite.transparent.destination-in.html
index cfc4d3113a14..cc07299497df 100644
--- a/content/canvas/test/test_2d.composite.transparent.destination-in.html
+++ b/content/canvas/test/test_2d.composite.transparent.destination-in.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.transparent.destination-in</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,95, "50,25", "0,255,0,95", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.transparent.destination-out.html b/content/canvas/test/test_2d.composite.transparent.destination-out.html
index 3f9643ed88a3..77301b292576 100644
--- a/content/canvas/test/test_2d.composite.transparent.destination-out.html
+++ b/content/canvas/test/test_2d.composite.transparent.destination-out.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.transparent.destination-out</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,31, "50,25", "0,255,0,31", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.transparent.destination-over.html b/content/canvas/test/test_2d.composite.transparent.destination-over.html
index f5727b0a9f0c..082efae4508b 100644
--- a/content/canvas/test/test_2d.composite.transparent.destination-over.html
+++ b/content/canvas/test/test_2d.composite.transparent.destination-over.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.transparent.destination-over</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,145,109,223, "50,25", "0,145,109,223", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.transparent.lighter.html b/content/canvas/test/test_2d.composite.transparent.lighter.html
index a8ecffda977d..3d4b5078579b 100644
--- a/content/canvas/test/test_2d.composite.transparent.lighter.html
+++ b/content/canvas/test/test_2d.composite.transparent.lighter.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.transparent.lighter</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,127,191,255, "50,25", "0,127,191,255", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.transparent.source-atop.html b/content/canvas/test/test_2d.composite.transparent.source-atop.html
index b3f2f1c23e7d..be0a14634052 100644
--- a/content/canvas/test/test_2d.composite.transparent.source-atop.html
+++ b/content/canvas/test/test_2d.composite.transparent.source-atop.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.transparent.source-atop</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,63,191,127, "50,25", "0,63,191,127", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.transparent.source-in.html b/content/canvas/test/test_2d.composite.transparent.source-in.html
index 39f2f478cf4c..104c0b821f8d 100644
--- a/content/canvas/test/test_2d.composite.transparent.source-in.html
+++ b/content/canvas/test/test_2d.composite.transparent.source-in.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.transparent.source-in</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,0,255,95, "50,25", "0,0,255,95", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.transparent.source-out.html b/content/canvas/test/test_2d.composite.transparent.source-out.html
index fcc766039bc5..afab264be818 100644
--- a/content/canvas/test/test_2d.composite.transparent.source-out.html
+++ b/content/canvas/test/test_2d.composite.transparent.source-out.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.transparent.source-out</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,0,255,95, "50,25", "0,0,255,95", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.transparent.source-over.html b/content/canvas/test/test_2d.composite.transparent.source-over.html
index f3855c0bb1de..bcbcac42bbf4 100644
--- a/content/canvas/test/test_2d.composite.transparent.source-over.html
+++ b/content/canvas/test/test_2d.composite.transparent.source-over.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.transparent.source-over</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,36,218,223, "50,25", "0,36,218,223", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.transparent.xor.html b/content/canvas/test/test_2d.composite.transparent.xor.html
index 839a67ac013a..8b9bad3b5601 100644
--- a/content/canvas/test/test_2d.composite.transparent.xor.html
+++ b/content/canvas/test/test_2d.composite.transparent.xor.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.composite.transparent.xor</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,63,191,127, "50,25", "0,63,191,127", 5);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.copy.html b/content/canvas/test/test_2d.composite.uncovered.fill.copy.html
new file mode 100644
index 000000000000..25b60b1990f4
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.copy.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.fill.copy</title>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.translate(0, 25);
+ctx.fillRect(0, 50, 100, 50);
+todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html b/content/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html
new file mode 100644
index 000000000000..6bb7f0fdefdf
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.fill.destination-atop</title>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.translate(0, 25);
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.destination-in.html b/content/canvas/test/test_2d.composite.uncovered.fill.destination-in.html
new file mode 100644
index 000000000000..78fa8d59b3e1
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.destination-in.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.fill.destination-in</title>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.translate(0, 25);
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.source-in.html b/content/canvas/test/test_2d.composite.uncovered.fill.source-in.html
new file mode 100644
index 000000000000..193d08266d8e
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.source-in.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.fill.source-in</title>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.translate(0, 25);
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.source-out.html b/content/canvas/test/test_2d.composite.uncovered.fill.source-out.html
new file mode 100644
index 000000000000..6aa0d92a520e
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.fill.source-out.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.fill.source-out</title>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.translate(0, 25);
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.composite.uncovered.image.copy.html b/content/canvas/test/test_2d.composite.uncovered.image.copy.html
new file mode 100644
index 000000000000..2182f0d641a6
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.image.copy.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.image.copy</title>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+ctx.drawImage(document.getElementById('yellow.png'), 40, 40, 10, 10, 40, 50, 10, 10)
+todo_isPixel(ctx, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
+todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow.png" id="yellow.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.uncovered.image.destination-atop.html b/content/canvas/test/test_2d.composite.uncovered.image.destination-atop.html
new file mode 100644
index 000000000000..4a6254a4ef7e
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.image.destination-atop.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.image.destination-atop</title>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.drawImage(document.getElementById('yellow.png'), 40, 40, 10, 10, 40, 50, 10, 10)
+todo_isPixel(ctx, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
+todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow.png" id="yellow.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.uncovered.image.destination-in.html b/content/canvas/test/test_2d.composite.uncovered.image.destination-in.html
new file mode 100644
index 000000000000..8655f5590bbe
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.image.destination-in.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.image.destination-in</title>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.drawImage(document.getElementById('yellow.png'), 40, 40, 10, 10, 40, 50, 10, 10)
+todo_isPixel(ctx, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
+todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow.png" id="yellow.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.uncovered.image.source-in.html b/content/canvas/test/test_2d.composite.uncovered.image.source-in.html
new file mode 100644
index 000000000000..eb6b49868250
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.image.source-in.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.image.source-in</title>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.drawImage(document.getElementById('yellow.png'), 40, 40, 10, 10, 40, 50, 10, 10)
+todo_isPixel(ctx, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
+todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow.png" id="yellow.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.uncovered.image.source-out.html b/content/canvas/test/test_2d.composite.uncovered.image.source-out.html
new file mode 100644
index 000000000000..8fd182eaa95c
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.image.source-out.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.image.source-out</title>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.drawImage(document.getElementById('yellow.png'), 40, 40, 10, 10, 40, 50, 10, 10)
+todo_isPixel(ctx, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
+todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow.png" id="yellow.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.copy.html b/content/canvas/test/test_2d.composite.uncovered.pattern.copy.html
new file mode 100644
index 000000000000..6d28819e8439
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.pattern.copy.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.pattern.copy</title>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+ctx.fillStyle = ctx.createPattern(document.getElementById('yellow.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow.png" id="yellow.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html b/content/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html
new file mode 100644
index 000000000000..41e1eb627245
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.pattern.destination-atop</title>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.fillStyle = ctx.createPattern(document.getElementById('yellow.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow.png" id="yellow.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html b/content/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html
new file mode 100644
index 000000000000..3c651ea4dda5
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.pattern.destination-in</title>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.fillStyle = ctx.createPattern(document.getElementById('yellow.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow.png" id="yellow.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.source-in.html b/content/canvas/test/test_2d.composite.uncovered.pattern.source-in.html
new file mode 100644
index 000000000000..8812d36d83a0
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.pattern.source-in.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.pattern.source-in</title>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.fillStyle = ctx.createPattern(document.getElementById('yellow.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow.png" id="yellow.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.source-out.html b/content/canvas/test/test_2d.composite.uncovered.pattern.source-out.html
new file mode 100644
index 000000000000..af7216a09ed2
--- /dev/null
+++ b/content/canvas/test/test_2d.composite.uncovered.pattern.source-out.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.uncovered.pattern.source-out</title>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.fillStyle = ctx.createPattern(document.getElementById('yellow.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_yellow.png" id="yellow.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.drawImage.3arg.html b/content/canvas/test/test_2d.drawImage.3arg.html
index 9eacd9eab750..4c2598f140bd 100644
--- a/content/canvas/test/test_2d.drawImage.3arg.html
+++ b/content/canvas/test/test_2d.drawImage.3arg.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.drawImage.3arg</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -37,7 +36,8 @@ isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
 isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
 isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red.png" id="red.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.5arg.html b/content/canvas/test/test_2d.drawImage.5arg.html
index 9258cf6c7038..5a1d8d0284e0 100644
--- a/content/canvas/test/test_2d.drawImage.5arg.html
+++ b/content/canvas/test/test_2d.drawImage.5arg.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.drawImage.5arg</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -38,7 +37,8 @@ isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
 isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
 isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red.png" id="red.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.9arg.basic.html b/content/canvas/test/test_2d.drawImage.9arg.basic.html
index ed1d2490653d..50ee7f51ad15 100644
--- a/content/canvas/test/test_2d.drawImage.9arg.basic.html
+++ b/content/canvas/test/test_2d.drawImage.9arg.basic.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.drawImage.9arg.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
 isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
 isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_green.png" id="green.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.9arg.destpos.html b/content/canvas/test/test_2d.drawImage.9arg.destpos.html
index d0e15da9a597..dbcfaad78233 100644
--- a/content/canvas/test/test_2d.drawImage.9arg.destpos.html
+++ b/content/canvas/test/test_2d.drawImage.9arg.destpos.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.drawImage.9arg.destpos</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -38,7 +37,8 @@ isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
 isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
 isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red.png" id="red.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.9arg.destsize.html b/content/canvas/test/test_2d.drawImage.9arg.destsize.html
index 68a1ab4f1614..f5c266b58fdd 100644
--- a/content/canvas/test/test_2d.drawImage.9arg.destsize.html
+++ b/content/canvas/test/test_2d.drawImage.9arg.destsize.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.drawImage.9arg.destsize</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -38,7 +37,8 @@ isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
 isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
 isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red.png" id="red.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.9arg.sourcepos.html b/content/canvas/test/test_2d.drawImage.9arg.sourcepos.html
index 3ec1dfa19b78..214777c370a2 100644
--- a/content/canvas/test/test_2d.drawImage.9arg.sourcepos.html
+++ b/content/canvas/test/test_2d.drawImage.9arg.sourcepos.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.drawImage.9arg.sourcepos</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
 isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
 isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_rgrg-256x256.png" id="rgrg-256x256.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.9arg.sourcesize.html b/content/canvas/test/test_2d.drawImage.9arg.sourcesize.html
index 8d61146d9d7d..a3c601ba4001 100644
--- a/content/canvas/test/test_2d.drawImage.9arg.sourcesize.html
+++ b/content/canvas/test/test_2d.drawImage.9arg.sourcesize.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.drawImage.9arg.sourcesize</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -41,7 +40,8 @@ isPixel(ctx, 80,20, 0,255,0,255, "80,20", "0,255,0,255", 2);
 isPixel(ctx, 20,30, 0,255,0,255, "20,30", "0,255,0,255", 2);
 isPixel(ctx, 80,30, 0,255,0,255, "80,30", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_rgrg-256x256.png" id="rgrg-256x256.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.alpha.html b/content/canvas/test/test_2d.drawImage.alpha.html
index d93018c97efa..25d2e45014b7 100644
--- a/content/canvas/test/test_2d.drawImage.alpha.html
+++ b/content/canvas/test/test_2d.drawImage.alpha.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.drawImage.alpha</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.globalAlpha = 0;
 ctx.drawImage(document.getElementById('red.png'), 0, 0);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red.png" id="red.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.animated.apng.html b/content/canvas/test/test_2d.drawImage.animated.apng.html
new file mode 100644
index 000000000000..b61b3358b01a
--- /dev/null
+++ b/content/canvas/test/test_2d.drawImage.animated.apng.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.drawImage.animated.apng</title>
+<!-- Testing: drawImage() of an APNG with no poster frame draws the first frame -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function deferTest() {
+    _deferred = true;
+}
+function wrapFunction(f) {
+    return function () {
+        f.apply(null, arguments);
+        SimpleTest.finish();
+    }
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+deferTest();
+setTimeout(wrapFunction(function () {
+    ctx.drawImage(document.getElementById('anim-gr.png'), 0, 0);
+    todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+}), 500);
+
+
+});
+</script>
+<img src="image_anim-gr.png" id="anim-gr.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.drawImage.animated.gif.html b/content/canvas/test/test_2d.drawImage.animated.gif.html
new file mode 100644
index 000000000000..82d2982d032c
--- /dev/null
+++ b/content/canvas/test/test_2d.drawImage.animated.gif.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.drawImage.animated.gif</title>
+<!-- Testing: drawImage() of an animated GIF draws the first frame -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function deferTest() {
+    _deferred = true;
+}
+function wrapFunction(f) {
+    return function () {
+        f.apply(null, arguments);
+        SimpleTest.finish();
+    }
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+deferTest();
+setTimeout(wrapFunction(function () {
+    ctx.drawImage(document.getElementById('anim-gr.gif'), 0, 0);
+    todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+}), 500);
+
+
+});
+</script>
+<img src="image_anim-gr.gif" id="anim-gr.gif" class="resource">
+
diff --git a/content/canvas/test/test_2d.drawImage.animated.poster.html b/content/canvas/test/test_2d.drawImage.animated.poster.html
new file mode 100644
index 000000000000..962a0497cd95
--- /dev/null
+++ b/content/canvas/test/test_2d.drawImage.animated.poster.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.drawImage.animated.poster</title>
+<!-- Testing: drawImage() of an APNG draws the poster frame -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.drawImage(document.getElementById('anim-poster-gr.png'), 0, 0);
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_anim-poster-gr.png" id="anim-poster-gr.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.drawImage.broken.html b/content/canvas/test/test_2d.drawImage.broken.html
index ce2ba752ad61..d187db07971f 100644
--- a/content/canvas/test/test_2d.drawImage.broken.html
+++ b/content/canvas/test/test_2d.drawImage.broken.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.drawImage.broken</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -20,7 +19,8 @@ var _thrown = undefined; try {
   ctx.drawImage(img, 0, 0);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INVALID_STATE_ERR, "should throw INVALID_STATE_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_broken.png" id="broken.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.canvas.html b/content/canvas/test/test_2d.drawImage.canvas.html
new file mode 100644
index 000000000000..8d7089c8dd8b
--- /dev/null
+++ b/content/canvas/test/test_2d.drawImage.canvas.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.drawImage.canvas</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#0f0';
+ctx2.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.drawImage(canvas2, 0, 0);
+
+isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2);
+isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
+isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
+isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.drawImage.clip.html b/content/canvas/test/test_2d.drawImage.clip.html
index 94f6729220c9..68f4bd0987fc 100644
--- a/content/canvas/test/test_2d.drawImage.clip.html
+++ b/content/canvas/test/test_2d.drawImage.clip.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.drawImage.clip</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.clip();
 ctx.drawImage(document.getElementById('red.png'), 0, 0);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red.png" id="red.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.composite.html b/content/canvas/test/test_2d.drawImage.composite.html
index bd4c3f6759a9..97913ff7a5dd 100644
--- a/content/canvas/test/test_2d.drawImage.composite.html
+++ b/content/canvas/test/test_2d.drawImage.composite.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.drawImage.composite</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.globalCompositeOperation = 'destination-over';
 ctx.drawImage(document.getElementById('red.png'), 0, 0);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red.png" id="red.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.floatsource.html b/content/canvas/test/test_2d.drawImage.floatsource.html
index a4d9ea918c43..2f010619ebc2 100644
--- a/content/canvas/test/test_2d.drawImage.floatsource.html
+++ b/content/canvas/test/test_2d.drawImage.floatsource.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.drawImage.floatsource</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -29,7 +28,8 @@ var ctx = canvas.getContext('2d');
 ctx.drawImage(document.getElementById('green.png'), 10.1, 10.1, 0.1, 0.1, 0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_green.png" id="green.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.incomplete.html b/content/canvas/test/test_2d.drawImage.incomplete.html
index 9e81d4ae25f5..5b3782645cb2 100644
--- a/content/canvas/test/test_2d.drawImage.incomplete.html
+++ b/content/canvas/test/test_2d.drawImage.incomplete.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.drawImage.incomplete</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -20,7 +19,8 @@ var _thrown = undefined; try {
   ctx.drawImage(img, 0, 0);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INVALID_STATE_ERR, "should throw INVALID_STATE_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.drawImage.negativedest.html b/content/canvas/test/test_2d.drawImage.negativedest.html
index 5f6a2d042a50..30e81e6462a9 100644
--- a/content/canvas/test/test_2d.drawImage.negativedest.html
+++ b/content/canvas/test/test_2d.drawImage.negativedest.html
@@ -2,11 +2,22 @@
 <title>Canvas test: 2d.drawImage.negativedest</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,17 +25,32 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-var _thrown = undefined; try {
-  ctx.drawImage(document.getElementById('red.png'), 10, 10, 1, 1, 0, 50, -100, 50);
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-var _thrown = undefined; try {
-  ctx.drawImage(document.getElementById('red.png'), 10, 10, 1, 1, 0, 50, 100, -50);
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('ggrr-256x256.png'), 100, 78, 50, 50, 0, 50, 50, -50);
+ctx.drawImage(document.getElementById('ggrr-256x256.png'), 100, 128, 50, -50, 100, 50, -50, -50);
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2);
+isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2);
+isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2);
+isPixel(ctx, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2);
+isPixel(ctx, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
-<img src="image_red.png" id="red.png" class="resource">
+<img src="image_ggrr-256x256.png" id="ggrr-256x256.png" class="resource">
 
diff --git a/content/canvas/test/test_2d.drawImage.negativesource.html b/content/canvas/test/test_2d.drawImage.negativesource.html
index 8bd458b4ed34..d8a5bd6a5ef4 100644
--- a/content/canvas/test/test_2d.drawImage.negativesource.html
+++ b/content/canvas/test/test_2d.drawImage.negativesource.html
@@ -2,11 +2,22 @@
 <title>Canvas test: 2d.drawImage.negativesource</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,14 +25,32 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-var _thrown = undefined; try {
-  ctx.drawImage(document.getElementById('red.png'), 10, 10, -1, 1, 0, 0, 100, 50);
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('ggrr-256x256.png'), 100, 78, -100, 50, 0, 0, 50, 50);
+ctx.drawImage(document.getElementById('ggrr-256x256.png'), 100, 128, -100, -50, 50, 0, 50, 50);
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2);
+isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2);
+isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2);
+isPixel(ctx, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2);
+isPixel(ctx, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
-<img src="image_red.png" id="red.png" class="resource">
+<img src="image_ggrr-256x256.png" id="ggrr-256x256.png" class="resource">
 
diff --git a/content/canvas/test/test_2d.drawImage.nonfinite.html b/content/canvas/test/test_2d.drawImage.nonfinite.html
new file mode 100644
index 000000000000..0d44b4883fc2
--- /dev/null
+++ b/content/canvas/test/test_2d.drawImage.nonfinite.html
@@ -0,0 +1,348 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.drawImage.nonfinite</title>
+<!-- Testing: drawImage() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+var red = document.getElementById('red.png');
+ctx.drawImage(red, Infinity, 0);
+ctx.drawImage(red, -Infinity, 0);
+ctx.drawImage(red, NaN, 0);
+ctx.drawImage(red, 0, Infinity);
+ctx.drawImage(red, 0, -Infinity);
+ctx.drawImage(red, 0, NaN);
+ctx.drawImage(red, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50);
+ctx.drawImage(red, -Infinity, 0, 100, 50);
+ctx.drawImage(red, NaN, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, -Infinity, 100, 50);
+ctx.drawImage(red, 0, NaN, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, -Infinity, 50);
+ctx.drawImage(red, 0, 0, NaN, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, -Infinity);
+ctx.drawImage(red, 0, 0, 100, NaN);
+ctx.drawImage(red, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(red, -Infinity, 0, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(red, NaN, 0, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, -Infinity, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, NaN, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, -Infinity, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, NaN, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, -Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, NaN, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, -Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, NaN, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, -Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, NaN, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, 0, -Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, 0, NaN, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, 0, 0, 100, -Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, 0, 0, 100, NaN);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, 0, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, 0, 0, Infinity, Infinity);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.imageData.put.type.extra.html b/content/canvas/test/test_2d.drawImage.nowrap.html
similarity index 56%
rename from content/canvas/test/test_2d.imageData.put.type.extra.html
rename to content/canvas/test/test_2d.drawImage.nowrap.html
index b8c0f591d15c..aeb808e5299c 100644
--- a/content/canvas/test/test_2d.imageData.put.type.extra.html
+++ b/content/canvas/test/test_2d.drawImage.nowrap.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.type.extra</title>
+<title>Canvas test: 2d.drawImage.nowrap</title>
+<!-- Testing: Stretched images do not get pixels wrapping around the edges -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -27,18 +27,15 @@ var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
 ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50)
-var imgdata1 = ctx.getImageData(45, 20, 10, 10);
-ctx.fillStyle = '#f00';
-ctx.fillRect(45, 20, 10, 10)
-var data = [];
-for (var i = 0; i < imgdata1.data.length; ++i)
-    data[i] = imgdata1.data[i];
-var imgdata2 = { width: imgdata1.width, height: imgdata1.height, data: data, extra: 123 };
-ctx.putImageData(imgdata2, 45, 20);
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('redtransparent.png'), -1950, 0, 2000, 50);
+isPixel(ctx, 45,25, 0,255,0,255, "45,25", "0,255,0,255", 2);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+isPixel(ctx, 55,25, 0,255,0,255, "55,25", "0,255,0,255", 2);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
+<img src="image_redtransparent.png" id="redtransparent.png" class="resource">
 
diff --git a/content/canvas/test/test_2d.drawImage.null.html b/content/canvas/test/test_2d.drawImage.null.html
index f8f9b2458884..26a7d1cfa00c 100644
--- a/content/canvas/test/test_2d.drawImage.null.html
+++ b/content/canvas/test/test_2d.drawImage.null.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.drawImage.null</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -18,7 +17,8 @@ var _thrown = undefined; try {
   ctx.drawImage(null, 0, 0);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.drawImage.outsidesource.html b/content/canvas/test/test_2d.drawImage.outsidesource.html
index 6b1b542e8bb0..8690c9b0335c 100644
--- a/content/canvas/test/test_2d.drawImage.outsidesource.html
+++ b/content/canvas/test/test_2d.drawImage.outsidesource.html
@@ -2,25 +2,33 @@
 <title>Canvas test: 2d.drawImage.outsidesource</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -29,7 +37,12 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+var _thrown_outer = false;
+try {
+
 ctx.drawImage(document.getElementById('green.png'), 10.5, 10.5, 89.5, 39.5, 0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green.png'), 5.5, 5.5, -5.5, -5.5, 0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green.png'), 100, 50, -5, -5, 0, 0, 100, 50);
 var _thrown = undefined; try {
   ctx.drawImage(document.getElementById('red.png'), -0.001, 0, 100, 50, 0, 0, 100, 50);
 } catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
@@ -45,9 +58,24 @@ var _thrown = undefined; try {
 var _thrown = undefined; try {
   ctx.drawImage(document.getElementById('red.png'), 50, 0, 50.001, 50, 0, 0, 100, 50);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red.png'), 0, 0, -5, 5, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red.png'), 0, 0, 5, -5, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red.png'), 110, 60, -20, -20, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
 todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_green.png" id="green.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.path.html b/content/canvas/test/test_2d.drawImage.path.html
index 88419ec9b7b0..c2f3948b4c3a 100644
--- a/content/canvas/test/test_2d.drawImage.path.html
+++ b/content/canvas/test/test_2d.drawImage.path.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.drawImage.path</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.drawImage(document.getElementById('red.png'), 0, 0);
 ctx.fill();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red.png" id="red.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.self.1.html b/content/canvas/test/test_2d.drawImage.self.1.html
new file mode 100644
index 000000000000..c993d13d3c97
--- /dev/null
+++ b/content/canvas/test/test_2d.drawImage.self.1.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.drawImage.self.1 - bug 433235</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(50, 0, 50, 50);
+ctx.drawImage(canvas, 50, 0);
+
+isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2);
+isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
+isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
+isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.drawImage.self.2.html b/content/canvas/test/test_2d.drawImage.self.2.html
new file mode 100644
index 000000000000..39372c771ce2
--- /dev/null
+++ b/content/canvas/test/test_2d.drawImage.self.2.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.drawImage.self.2 - bug 433235</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 1, 100, 49);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 1);
+ctx.drawImage(canvas, 0, 1);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 2);
+
+isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2);
+isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
+isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
+isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.drawImage.self.html b/content/canvas/test/test_2d.drawImage.self.html
deleted file mode 100644
index 8e5e34ea5c64..000000000000
--- a/content/canvas/test/test_2d.drawImage.self.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.self</title>
-<script src="/MochiKit/MochiKit.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="300" height="150"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = 'lime';
-ctx.fillRect(0, 0, 300, 150);
-ctx.fillStyle = 'red';
-ctx.fillRect(0, 0, 300, 1);
-// Here the canvas should be 1 row red, 149 rows lime
-ctx.drawImage(canvas, 0, 1);
-// Here the canvas should be 2 rows red, 148 rows lime
-ctx.fillStyle = 'lime';
-ctx.fillRect(0, 0, 300, 2);
-// Here the canvas should be 150 rows lime
-
-isPixel(ctx, 150,100, 0,255,0,255, "150,100", "0,255,0,255", 0);
-
-if (!_deferred) SimpleTest.finish();
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.drawImage.transform.html b/content/canvas/test/test_2d.drawImage.transform.html
index 00249513501c..bf319403c75d 100644
--- a/content/canvas/test/test_2d.drawImage.transform.html
+++ b/content/canvas/test/test_2d.drawImage.transform.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.drawImage.transform</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.translate(100, 0);
 ctx.drawImage(document.getElementById('red.png'), 0, 0);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red.png" id="red.png" class="resource">
diff --git a/content/canvas/test/test_2d.drawImage.wrongtype.html b/content/canvas/test/test_2d.drawImage.wrongtype.html
index 097414565fdb..5030d8ab18d8 100644
--- a/content/canvas/test/test_2d.drawImage.wrongtype.html
+++ b/content/canvas/test/test_2d.drawImage.wrongtype.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.drawImage.wrongtype</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -27,7 +26,8 @@ var _thrown = undefined; try {
   ctx.drawImage(document.createElement('p'), 0, 0);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.drawImage.zerosource.html b/content/canvas/test/test_2d.drawImage.zerosource.html
index 21e857083a00..3b241a2d14e3 100644
--- a/content/canvas/test/test_2d.drawImage.zerosource.html
+++ b/content/canvas/test/test_2d.drawImage.zerosource.html
@@ -1,27 +1,24 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.drawImage.zerosource</title>
+<!-- Testing: drawImage with zero-sized source rectangle throws INDEX_SIZE_ERR -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
-}
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -29,17 +26,22 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-ctx.fillStyle = '#f00';
+ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
-ctx.drawImage(document.getElementById('green.png'), 10, 10, 0, 1, 0, 0, 30, 50);
-ctx.drawImage(document.getElementById('green.png'), 10, 10, 1, 0, 30, 0, 40, 50);
-ctx.drawImage(document.getElementById('green.png'), 10, 10, 0, 0, 70, 0, 30, 50);
-todo_isPixel(ctx, 15,25, 0,255,0,255, "15,25", "0,255,0,255", 2);
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-todo_isPixel(ctx, 85,25, 0,255,0,255, "85,25", "0,255,0,255", 2);
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red.png'), 10, 10, 0, 1, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red.png'), 10, 10, 1, 0, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red.png'), 10, 10, 0, 0, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
-<img src="image_green.png" id="green.png" class="resource">
+<img src="image_red.png" id="red.png" class="resource">
 
diff --git a/content/canvas/test/test_2d.fillRect.basic.html b/content/canvas/test/test_2d.fillRect.basic.html
index 2c178512d805..78da02b268f0 100644
--- a/content/canvas/test/test_2d.fillRect.basic.html
+++ b/content/canvas/test/test_2d.fillRect.basic.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillRect.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -30,7 +29,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillRect.clip.html b/content/canvas/test/test_2d.fillRect.clip.html
index 9aa6a4784f50..38d6aec4757e 100644
--- a/content/canvas/test/test_2d.fillRect.clip.html
+++ b/content/canvas/test/test_2d.fillRect.clip.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillRect.clip</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -41,7 +40,8 @@ ctx.fillRect(0, 0, 16, 16);
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillRect.negative.html b/content/canvas/test/test_2d.fillRect.negative.html
index 2a14934d1615..e41911589ab4 100644
--- a/content/canvas/test/test_2d.fillRect.negative.html
+++ b/content/canvas/test/test_2d.fillRect.negative.html
@@ -2,11 +2,22 @@
 <title>Canvas test: 2d.fillRect.negative</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,14 +25,20 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-var _thrown = undefined; try {
-  ctx.fillRect(0, 0, -1, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-var _thrown = undefined; try {
-  ctx.fillRect(0, 0, 1, -1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 25);
+ctx.fillRect(100, 0, -50, 25);
+ctx.fillRect(0, 50, 50, -25);
+ctx.fillRect(100, 50, -50, -25);
+isPixel(ctx, 25,12, 0,255,0,255, "25,12", "0,255,0,255", 0);
+isPixel(ctx, 75,12, 0,255,0,255, "75,12", "0,255,0,255", 0);
+isPixel(ctx, 25,37, 0,255,0,255, "25,37", "0,255,0,255", 0);
+isPixel(ctx, 75,37, 0,255,0,255, "75,37", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillRect.nonfinite.html b/content/canvas/test/test_2d.fillRect.nonfinite.html
new file mode 100644
index 000000000000..0b2b477f4271
--- /dev/null
+++ b/content/canvas/test/test_2d.fillRect.nonfinite.html
@@ -0,0 +1,71 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillRect.nonfinite</title>
+<!-- Testing: fillRect() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(Infinity, 0, 100, 50);
+ctx.fillRect(-Infinity, 0, 100, 50);
+ctx.fillRect(NaN, 0, 100, 50);
+ctx.fillRect(0, Infinity, 100, 50);
+ctx.fillRect(0, -Infinity, 100, 50);
+ctx.fillRect(0, NaN, 100, 50);
+ctx.fillRect(0, 0, Infinity, 50);
+ctx.fillRect(0, 0, -Infinity, 50);
+ctx.fillRect(0, 0, NaN, 50);
+ctx.fillRect(0, 0, 100, Infinity);
+ctx.fillRect(0, 0, 100, -Infinity);
+ctx.fillRect(0, 0, 100, NaN);
+ctx.fillRect(Infinity, Infinity, 100, 50);
+ctx.fillRect(Infinity, Infinity, Infinity, 50);
+ctx.fillRect(Infinity, Infinity, Infinity, Infinity);
+ctx.fillRect(Infinity, Infinity, 100, Infinity);
+ctx.fillRect(Infinity, 0, Infinity, 50);
+ctx.fillRect(Infinity, 0, Infinity, Infinity);
+ctx.fillRect(Infinity, 0, 100, Infinity);
+ctx.fillRect(0, Infinity, Infinity, 50);
+ctx.fillRect(0, Infinity, Infinity, Infinity);
+ctx.fillRect(0, Infinity, 100, Infinity);
+ctx.fillRect(0, 0, Infinity, Infinity);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillRect.path.html b/content/canvas/test/test_2d.fillRect.path.html
index bbf6522b5f50..8da50d0b0a59 100644
--- a/content/canvas/test/test_2d.fillRect.path.html
+++ b/content/canvas/test/test_2d.fillRect.path.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillRect.path</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillRect.shadow.html b/content/canvas/test/test_2d.fillRect.shadow.html
index 990da6f7eb5a..c3ce3069983d 100644
--- a/content/canvas/test/test_2d.fillRect.shadow.html
+++ b/content/canvas/test/test_2d.fillRect.shadow.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillRect.shadow</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -45,7 +44,8 @@ ctx.fillRect(0, -50, 100, 50);
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillRect.transform.html b/content/canvas/test/test_2d.fillRect.transform.html
index 57e3b9123245..739a57c5ce6a 100644
--- a/content/canvas/test/test_2d.fillRect.transform.html
+++ b/content/canvas/test/test_2d.fillRect.transform.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillRect.transform</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, -5, 10, 5);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillRect.zero.html b/content/canvas/test/test_2d.fillRect.zero.html
index ee6e7f671320..e250d42957a0 100644
--- a/content/canvas/test/test_2d.fillRect.zero.html
+++ b/content/canvas/test/test_2d.fillRect.zero.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillRect.zero</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,13 +25,16 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 0);
 ctx.fillRect(0, 0, 0, 50);
 ctx.fillRect(0, 0, 0, 0);
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.default.html b/content/canvas/test/test_2d.fillStyle.default.html
index d2bfe8836433..44a537582e61 100644
--- a/content/canvas/test/test_2d.fillStyle.default.html
+++ b/content/canvas/test/test_2d.fillStyle.default.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.fillStyle.default</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +15,8 @@ var ctx = canvas.getContext('2d');
 
 ok(ctx.fillStyle == '#000000', "ctx.fillStyle == '#000000'");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.get.semitransparent.html b/content/canvas/test/test_2d.fillStyle.get.semitransparent.html
index 5374f5ccd2ad..14131bc8f343 100644
--- a/content/canvas/test/test_2d.fillStyle.get.semitransparent.html
+++ b/content/canvas/test/test_2d.fillStyle.get.semitransparent.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.fillStyle.get.semitransparent</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +16,8 @@ var ctx = canvas.getContext('2d');
 ctx.fillStyle = 'rgba(255,255,255,0.45)';
 ok(ctx.fillStyle =~ /^rgba\(255, 255, 255, 0\.4\d+\)$/, "ctx.fillStyle =~ /^rgba\\(255, 255, 255, 0\\.4\\d+\\)$/");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.get.solid.html b/content/canvas/test/test_2d.fillStyle.get.solid.html
index 06164aac0364..2c4c11b669fc 100644
--- a/content/canvas/test/test_2d.fillStyle.get.solid.html
+++ b/content/canvas/test/test_2d.fillStyle.get.solid.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.fillStyle.get.solid</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +16,8 @@ var ctx = canvas.getContext('2d');
 ctx.fillStyle = '#fa0';
 ok(ctx.fillStyle === '#ffaa00', "ctx.fillStyle === '#ffaa00'");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.get.transparent.html b/content/canvas/test/test_2d.fillStyle.get.transparent.html
index 3d721c4f23cd..bc0404feabbc 100644
--- a/content/canvas/test/test_2d.fillStyle.get.transparent.html
+++ b/content/canvas/test/test_2d.fillStyle.get.transparent.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.fillStyle.get.transparent</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +16,8 @@ var ctx = canvas.getContext('2d');
 ctx.fillStyle = 'rgba(0,0,0,0)';
 ok(ctx.fillStyle == 'rgba(0, 0, 0, 0.0)', "ctx.fillStyle == 'rgba(0, 0, 0, 0.0)'");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.invalidstring.html b/content/canvas/test/test_2d.fillStyle.invalidstring.html
index a51b09be4538..b590648f1c08 100644
--- a/content/canvas/test/test_2d.fillStyle.invalidstring.html
+++ b/content/canvas/test/test_2d.fillStyle.invalidstring.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.invalidstring</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.fillStyle = 'invalid';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.invalidtype.html b/content/canvas/test/test_2d.fillStyle.invalidtype.html
index 34e9ba45de44..bb253f40e60e 100644
--- a/content/canvas/test/test_2d.fillStyle.invalidtype.html
+++ b/content/canvas/test/test_2d.fillStyle.invalidtype.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.invalidtype</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.fillStyle = null;
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.current.basic.html b/content/canvas/test/test_2d.fillStyle.parse.current.basic.html
new file mode 100644
index 000000000000..203dfaa747ac
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.current.basic.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.current.basic</title>
+<!-- Testing: currentColor is computed from the canvas element -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('style', 'color: #0f0');
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'currentColor';
+ctx.fillRect(0, 0, 100, 50);
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.current.changed.html b/content/canvas/test/test_2d.fillStyle.parse.current.changed.html
new file mode 100644
index 000000000000..e80462f0359d
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.current.changed.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.current.changed</title>
+<!-- Testing: currentColor is computed when the attribute is set, not when it is painted -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('style', 'color: #0f0');
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'currentColor';
+canvas.setAttribute('style', 'color: #f00');
+ctx.fillRect(0, 0, 100, 50);
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.current.removed.html b/content/canvas/test/test_2d.fillStyle.parse.current.removed.html
new file mode 100644
index 000000000000..8dcfc2b75d11
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.current.removed.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.current.removed</title>
+<!-- Testing: currentColor is solid black when the canvas element is not in a document -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+// Try not to let it undetectably incorrectly pick up opaque-black
+// from other parts of the document:
+document.body.parentNode.setAttribute('style', 'color: #f00');
+document.body.setAttribute('style', 'color: #f00');
+canvas.setAttribute('style', 'color: #f00');
+
+var canvas2 = document.createElement('canvas');
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#f00';
+ctx2.fillStyle = 'currentColor';
+ctx2.fillRect(0, 0, 100, 50);
+ctx.drawImage(canvas2, 0, 0);
+
+document.body.parentNode.removeAttribute('style');
+document.body.removeAttribute('style');
+
+todo_isPixel(ctx, 50,25, 0,0,0,255, "50,25", "0,0,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hex3.html b/content/canvas/test/test_2d.fillStyle.parse.hex3.html
index a529282b8064..c60fa41e4f99 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.hex3.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.hex3.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.hex3</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hex6.html b/content/canvas/test/test_2d.fillStyle.parse.hex6.html
index d8bc1a1003d1..42fa660ac926 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.hex6.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.hex6.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.hex6</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = '#00fF00';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-1.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-1.html
index 6797f876db55..3784b54fdd6e 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.hsl-1.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsl-1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.hsl-1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'hsl(120, 100%, 50%)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-2.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-2.html
index 88e53e9e4d8d..64a8a038f9bd 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.hsl-2.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsl-2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.hsl-2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -28,11 +27,12 @@ var ctx = canvas.getContext('2d');
 
 
 ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsl(-240, 100%, 50%)';
+ctx.fillStyle = 'hsl( -240 , 100% , 50% )';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-3.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-3.html
index b5e03242856e..1cd15ef05b26 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.hsl-3.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsl-3.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.hsl-3</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'hsl(360120, 100%, 50%)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-4.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-4.html
index 76910a51c68f..69a1212a5f51 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.hsl-4.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsl-4.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.hsl-4</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'hsl(-360240, 100%, 50%)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-5.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-5.html
index c7f27e15c8e0..4bdcc3abc768 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.hsl-5.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsl-5.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.hsl-5</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-1.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-1.html
new file mode 100644
index 000000000000..04111e014609
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-1.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.hsl-clamp-1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsl(120, 200%, 50%)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-2.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-2.html
new file mode 100644
index 000000000000..e2d7ec7d1383
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-2.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.hsl-clamp-2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsl(120, -200%, 49.9%)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-3.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-3.html
new file mode 100644
index 000000000000..83ec31435b1a
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-3.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.hsl-clamp-3</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsl(120, 100%, 200%)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 255,255,255,255, "50,25", "255,255,255,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-4.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-4.html
new file mode 100644
index 000000000000..4ad8b60e85b3
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-4.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.hsl-clamp-4</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsl(120, 100%, -200%)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,255, "50,25", "0,0,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-1.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-1.html
index ecfcc380245a..060c9026ac74 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.hsla-1.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsla-1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.hsla-1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'hsla(120, 100%, 50%, 0.499)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,127, "50,25", "0,255,0,127", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-2.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-2.html
index 0dad04177169..fac03dcab785 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.hsla-2.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsla-2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.hsla-2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -28,11 +27,12 @@ var ctx = canvas.getContext('2d');
 
 
 ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsla(120.0, 100.0%, 50.0%, 1)';
+ctx.fillStyle = 'hsla( 120.0 , 100.0% , 50.0% , 1 )';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-1.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-1.html
new file mode 100644
index 000000000000..44389d2b5fdc
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-1.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.hsla-clamp-1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsla(120, 200%, 50%, 1)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-2.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-2.html
new file mode 100644
index 000000000000..f283cf3ac98f
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-2.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.hsla-clamp-2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsla(120, -200%, 49.9%, 1)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-3.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-3.html
new file mode 100644
index 000000000000..1162a0f6bf38
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-3.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.hsla-clamp-3</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsla(120, 100%, 200%, 1)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 255,255,255,255, "50,25", "255,255,255,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-4.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-4.html
new file mode 100644
index 000000000000..7f51c0fa70d3
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-4.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.hsla-clamp-4</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsla(120, 100%, -200%, 1)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,255, "50,25", "0,0,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-5.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-5.html
new file mode 100644
index 000000000000..6be7ea941b37
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-5.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.hsla-clamp-5</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsla(120, 100%, 50%, 2)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-6.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-6.html
new file mode 100644
index 000000000000..682adb405c2b
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-6.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.hsla-clamp-6</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsla(120, 100%, 0%, -2)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.html4.html b/content/canvas/test/test_2d.fillStyle.parse.html4.html
index fbea2671acd7..8fe5bc3ddf82 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.html4.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.html4.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.html4</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'limE';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hex3.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hex3.html
index 56bbee4035c1..30c2df762bd8 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hex3.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.hex3.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.hex3</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = '#g00'; } catch (e) { } // this shouldn't throw, but it sh
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hex6.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hex6.html
index 30630b77aa37..6238c5e7973e 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hex6.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.hex6.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.hex6</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = '#fg0000'; } catch (e) { } // this shouldn't throw, but it
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-1.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-1.html
index c4ea85ca4f8e..3615d8d50bbb 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-1.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.hsl-1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = 'hsl(0%, 100%, 50%)'; } catch (e) { } // this shouldn't th
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-2.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-2.html
index acf08e45d17a..04ae350e7f2f 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-2.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.hsl-2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = 'hsl(z, 100%, 50%)'; } catch (e) { } // this shouldn't thr
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-3.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-3.html
index 2ba55f9ecb31..847bf3bc3f98 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-3.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-3.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.hsl-3</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = 'hsl(0, 0, 50%)'; } catch (e) { } // this shouldn't throw,
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-4.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-4.html
index a38e8c2f1ebc..4faa8fb2d549 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-4.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-4.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.hsl-4</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = 'hsl(0, 100%, 0)'; } catch (e) { } // this shouldn't throw
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-5.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-5.html
new file mode 100644
index 000000000000..c3cb3ccca563
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-5.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.invalid.hsl-5</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'hsl(0, 100%, 100%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsla-1.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsla-1.html
new file mode 100644
index 000000000000..f92c0b811097
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsla-1.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.invalid.hsla-1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'hsla(0%, 100%, 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsla-2.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsla-2.html
new file mode 100644
index 000000000000..127df8cb9847
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsla-2.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.invalid.hsla-2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'hsla(0, 0, 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-1.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-1.html
index cd89fb57c162..5e60ae7ce560 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-1.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.rgb-1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = 'rgb(255.0, 0, 0)'; } catch (e) { } // this shouldn't thro
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-2.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-2.html
index 8c1b4b2e3888..69d5ba642017 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-2.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.rgb-2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = 'rgb(255, 0.0, 0)'; } catch (e) { } // this shouldn't thro
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-3.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-3.html
index 655f749c5af2..f1ffdefa470b 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-3.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-3.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.rgb-3</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = 'rgb(255.0, 0, 0,)'; } catch (e) { } // this shouldn't thr
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-4.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-4.html
index 0b77a0938a31..8f3d458ae166 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-4.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-4.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.rgb-4</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = 'rgb(100%, 0, 0)'; } catch (e) { } // this shouldn't throw
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-5.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-5.html
new file mode 100644
index 000000000000..af8cd673a6c0
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-5.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.invalid.rgb-5</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgb(255 0 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-6.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-6.html
new file mode 100644
index 000000000000..125abd0c23cf
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-6.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.invalid.rgb-6</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgb(255, - 1, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-7.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-7.html
new file mode 100644
index 000000000000..092c77857d76
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-7.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.invalid.rgb-7</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgb(255, 0, 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-1.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-1.html
index 908e6fecdb49..381f55ed3106 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-1.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.rgba-1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = 'rgba(255, 0, 0)'; } catch (e) { } // this shouldn't throw
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-2.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-2.html
index 4a4bc20b398a..9ae6c1a0b3bb 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-2.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.rgba-2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = 'rgba(255.0, 0, 0, 1)'; } catch (e) { } // this shouldn't
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-3.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-3.html
index 84ae5f6e7921..0f56b2c20a78 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-3.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-3.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.rgba-3</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = 'rgba(100%, 0, 0, 1)'; } catch (e) { } // this shouldn't t
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-4.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-4.html
index f86cefa1ec89..bd6dd5b21042 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-4.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-4.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.rgba-4</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = 'rgba(255, 0, 0, 100%)'; } catch (e) { } // this shouldn't
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-5.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-5.html
index f34be749eb89..ef521a7c80d9 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-5.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-5.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.invalid.rgba-5</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ try { ctx.fillStyle = 'rgba(255, 0, 0, 1. 0)'; } catch (e) { } // this shouldn't
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-1.html b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-1.html
index 9833b3e048e4..981cafd90221 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-1.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.rgb-clamp-1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'rgb(-1000, 1000, -1000)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-2.html b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-2.html
index a601d4e62986..eff2e40effa1 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-2.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.rgb-clamp-2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'rgb(-200%, 200%, -200%)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-3.html b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-3.html
new file mode 100644
index 000000000000..61c37a30af89
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-3.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.rgb-clamp-3</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgb(-2147483649, 4294967298, -18446744073709551619)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-4.html b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-4.html
new file mode 100644
index 000000000000..94370847bf7d
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-4.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.rgb-clamp-4</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgb(-1000000000000000000000000000000000000000, 1000000000000000000000000000000000000000, -1000000000000000000000000000000000000000)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-5.html b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-5.html
new file mode 100644
index 000000000000..91e58ec87405
--- /dev/null
+++ b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-5.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.rgb-clamp-5</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgb(-10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, -10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgb-num.html b/content/canvas/test/test_2d.fillStyle.parse.rgb-num.html
index 6948a0d7d858..cf48518a35a3 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.rgb-num.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.rgb-num.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.rgb-num</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'rgb(0,255,0)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgb-percent.html b/content/canvas/test/test_2d.fillStyle.parse.rgb-percent.html
index 149228c99189..d01a004fe175 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.rgb-percent.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.rgb-percent.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.rgb-percent</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'rgb(0% ,100% ,0%)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-1.html b/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-1.html
index 636b38b5ce92..e1aa9d5e844b 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-1.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.rgba-clamp-1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'rgba(0, 255, 0, -2)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-2.html b/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-2.html
index 52cafc36b7e4..a25d6cebc2c6 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-2.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.rgba-clamp-2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'rgba(0, 255, 0, 2)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgba-num-1.html b/content/canvas/test/test_2d.fillStyle.parse.rgba-num-1.html
index 7f7597e0df8b..951c85704abd 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.rgba-num-1.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.rgba-num-1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.rgba-num-1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  .499  )';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,127, "50,25", "0,255,0,127", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgba-num-2.html b/content/canvas/test/test_2d.fillStyle.parse.rgba-num-2.html
index 33661875d1a2..4d8ac5ea6816 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.rgba-num-2.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.rgba-num-2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.rgba-num-2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  0.499  )';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,127, "50,25", "0,255,0,127", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgba-percent.html b/content/canvas/test/test_2d.fillStyle.parse.rgba-percent.html
index a4482ae07729..6a3d299b6965 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.rgba-percent.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.rgba-percent.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.rgba-percent</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'rgba(0%,100%,0%,0.499)';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,127, "50,25", "0,255,0,127", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-1.html b/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-1.html
index 9599fe4119a9..7affeb8168d7 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-1.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.rgba-solid-1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  1  )';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-2.html b/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-2.html
index 4d37945ce496..61f389e2f12c 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-2.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.rgba-solid-2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  1.0  )';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.svg-1.html b/content/canvas/test/test_2d.fillStyle.parse.svg-1.html
index 9dd879174e01..610ea58f7c7c 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.svg-1.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.svg-1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.svg-1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'gray';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 128,128,128,255, "50,25", "128,128,128,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.svg-2.html b/content/canvas/test/test_2d.fillStyle.parse.svg-2.html
index ca7e69db6eb2..ab639ded54f4 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.svg-2.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.svg-2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.svg-2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'grey';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 128,128,128,255, "50,25", "128,128,128,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.system.html b/content/canvas/test/test_2d.fillStyle.parse.system.html
index 11a542e033b2..18e89dce317a 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.system.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.system.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.fillStyle.parse.system</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -19,7 +18,8 @@ ctx.fillStyle = '#f00';
 ctx.fillStyle = 'ThreeDDarkShadow';
 ok(ctx.fillStyle =~ /^#(?!(FF0000|ff0000|f00)$)/, "ctx.fillStyle =~ /^#(?!(FF0000|ff0000|f00)$)/"); // test that it's not red
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.transparent-1.html b/content/canvas/test/test_2d.fillStyle.parse.transparent-1.html
index 0f453c443c8f..30d25c1fdb8a 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.transparent-1.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.transparent-1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.transparent-1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'transparent';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.fillStyle.parse.transparent-2.html b/content/canvas/test/test_2d.fillStyle.parse.transparent-2.html
index e87591ee22ca..e938c05af2c1 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.transparent-2.html
+++ b/content/canvas/test/test_2d.fillStyle.parse.transparent-2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.fillStyle.parse.transparent-2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = 'TrAnSpArEnT';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.getcontext.exists.html b/content/canvas/test/test_2d.getcontext.exists.html
index 7e1719459e59..49a1651db920 100644
--- a/content/canvas/test/test_2d.getcontext.exists.html
+++ b/content/canvas/test/test_2d.getcontext.exists.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.getcontext.exists</title>
+<!-- Testing: The 2D context is implemented -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(canvas.getContext('2d') !== null, "canvas.getContext('2d') !== null");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.getcontext.shared.html b/content/canvas/test/test_2d.getcontext.shared.html
index 3447e83760e7..404ceb679ba3 100644
--- a/content/canvas/test/test_2d.getcontext.shared.html
+++ b/content/canvas/test/test_2d.getcontext.shared.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.getcontext.shared</title>
+<!-- Testing: getContext('2d') returns objects which share canvas state -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +32,8 @@ ctx2.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.getcontext.unique.html b/content/canvas/test/test_2d.getcontext.unique.html
index 7ef820a1a79b..bee538e523d6 100644
--- a/content/canvas/test/test_2d.getcontext.unique.html
+++ b/content/canvas/test/test_2d.getcontext.unique.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.getcontext.unique</title>
+<!-- Testing: getContext('2d') returns the same object -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(canvas.getContext('2d') === canvas.getContext('2d'), "canvas.getContext('2d') === canvas.getContext('2d')");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.empty.html b/content/canvas/test/test_2d.gradient.empty.html
index 00c3d1e7b693..c2b84b562d6a 100644
--- a/content/canvas/test/test_2d.gradient.empty.html
+++ b/content/canvas/test/test_2d.gradient.empty.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.empty</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.interpolate.alpha.html b/content/canvas/test/test_2d.gradient.interpolate.alpha.html
index c267b52509e8..0560920d5268 100644
--- a/content/canvas/test/test_2d.gradient.interpolate.alpha.html
+++ b/content/canvas/test/test_2d.gradient.interpolate.alpha.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.interpolate.alpha</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,11 +32,12 @@ g.addColorStop(0, 'rgba(0,0,255, 0)');
 g.addColorStop(1, 'rgba(0,0,255, 1)');
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 4);
-isPixel(ctx, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 4);
-isPixel(ctx, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 4);
+isPixel(ctx, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 3);
+isPixel(ctx, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3);
+isPixel(ctx, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.interpolate.colour.html b/content/canvas/test/test_2d.gradient.interpolate.colour.html
index cad93a21bda4..1398b183860b 100644
--- a/content/canvas/test/test_2d.gradient.interpolate.colour.html
+++ b/content/canvas/test/test_2d.gradient.interpolate.colour.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.interpolate.colour</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -31,11 +30,12 @@ g.addColorStop(0, '#ff0');
 g.addColorStop(1, '#00f');
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 4);
-isPixel(ctx, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 4);
-isPixel(ctx, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 4);
+isPixel(ctx, 25,25, 191,191,63,255, "25,25", "191,191,63,255", 3);
+isPixel(ctx, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3);
+isPixel(ctx, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.interpolate.colouralpha.html b/content/canvas/test/test_2d.gradient.interpolate.colouralpha.html
index 7e56e8578bbc..fa4a7d4a6a59 100644
--- a/content/canvas/test/test_2d.gradient.interpolate.colouralpha.html
+++ b/content/canvas/test/test_2d.gradient.interpolate.colouralpha.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.interpolate.colouralpha</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -31,11 +30,12 @@ g.addColorStop(0, 'rgba(255,255,0, 0)');
 g.addColorStop(1, 'rgba(0,0,255, 1)');
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 25,25, 191,191,63,63, "25,25", "191,191,63,63", 4);
-isPixel(ctx, 50,25, 127,127,127,127, "50,25", "127,127,127,127", 4);
-isPixel(ctx, 75,25, 63,63,191,191, "75,25", "63,63,191,191", 4);
+isPixel(ctx, 25,25, 191,191,63,63, "25,25", "191,191,63,63", 3);
+isPixel(ctx, 50,25, 127,127,127,127, "50,25", "127,127,127,127", 3);
+isPixel(ctx, 75,25, 63,63,191,191, "75,25", "63,63,191,191", 3);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.interpolate.multiple.html b/content/canvas/test/test_2d.gradient.interpolate.multiple.html
index 7ada5524c908..b8de70472bee 100644
--- a/content/canvas/test/test_2d.gradient.interpolate.multiple.html
+++ b/content/canvas/test/test_2d.gradient.interpolate.multiple.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.interpolate.multiple</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,11 +32,12 @@ g.addColorStop(0.5, '#0ff');
 g.addColorStop(1, '#f0f');
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 200, 50);
-isPixel(ctx, 50,25, 127,255,127,255, "50,25", "127,255,127,255", 4);
-isPixel(ctx, 100,25, 0,255,255,255, "100,25", "0,255,255,255", 4);
-isPixel(ctx, 150,25, 127,127,255,255, "150,25", "127,127,255,255", 4);
+isPixel(ctx, 50,25, 127,255,127,255, "50,25", "127,255,127,255", 3);
+isPixel(ctx, 100,25, 0,255,255,255, "100,25", "0,255,255,255", 3);
+isPixel(ctx, 150,25, 127,127,255,255, "150,25", "127,127,255,255", 3);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.interpolate.outside.html b/content/canvas/test/test_2d.gradient.interpolate.outside.html
index 6a9f28951048..1dc2bc75baec 100644
--- a/content/canvas/test/test_2d.gradient.interpolate.outside.html
+++ b/content/canvas/test/test_2d.gradient.interpolate.outside.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.interpolate.outside</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -39,7 +38,8 @@ isPixel(ctx, 20,25, 0,255,0,255, "20,25", "0,255,0,255", 2);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 isPixel(ctx, 80,25, 0,255,0,255, "80,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.interpolate.overlap.html b/content/canvas/test/test_2d.gradient.interpolate.overlap.html
index e4d9ebcb0c58..72f033356d43 100644
--- a/content/canvas/test/test_2d.gradient.interpolate.overlap.html
+++ b/content/canvas/test/test_2d.gradient.interpolate.overlap.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.interpolate.overlap</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -53,7 +52,8 @@ isPixel(ctx, 101,25, 255,255,0,255, "101,25", "255,255,0,255", 16);
 isPixel(ctx, 149,25, 0,0,255,255, "149,25", "0,0,255,255", 16);
 isPixel(ctx, 151,25, 255,255,0,255, "151,25", "255,255,0,255", 16);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.interpolate.overlap2.html b/content/canvas/test/test_2d.gradient.interpolate.overlap2.html
index f02dff75ded1..ef86856b489c 100644
--- a/content/canvas/test/test_2d.gradient.interpolate.overlap2.html
+++ b/content/canvas/test/test_2d.gradient.interpolate.overlap2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.interpolate.overlap2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -43,7 +42,8 @@ isPixel(ctx, 40,25, 0,255,0,255, "40,25", "0,255,0,255", 0);
 isPixel(ctx, 60,25, 0,255,0,255, "60,25", "0,255,0,255", 0);
 isPixel(ctx, 80,25, 0,255,0,255, "80,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.interpolate.solid.html b/content/canvas/test/test_2d.gradient.interpolate.solid.html
index 4e45f5702a00..d18ed44874bc 100644
--- a/content/canvas/test/test_2d.gradient.interpolate.solid.html
+++ b/content/canvas/test/test_2d.gradient.interpolate.solid.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.interpolate.solid</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.interpolate.vertical.html b/content/canvas/test/test_2d.gradient.interpolate.vertical.html
index feba6db15221..4b87a15be4cf 100644
--- a/content/canvas/test/test_2d.gradient.interpolate.vertical.html
+++ b/content/canvas/test/test_2d.gradient.interpolate.vertical.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.interpolate.vertical</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +34,8 @@ isPixel(ctx, 50,12, 191,191,63,255, "50,12", "191,191,63,255", 10);
 isPixel(ctx, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 5);
 isPixel(ctx, 50,37, 63,63,191,255, "50,37", "63,63,191,255", 10);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.interpolate.zerosize.html b/content/canvas/test/test_2d.gradient.interpolate.zerosize.html
index 82ed77295fe5..c127b3a106c9 100644
--- a/content/canvas/test/test_2d.gradient.interpolate.zerosize.html
+++ b/content/canvas/test/test_2d.gradient.interpolate.zerosize.html
@@ -2,25 +2,33 @@
 <title>Canvas test: 2d.gradient.interpolate.zerosize</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -39,7 +47,8 @@ ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 todo_isPixel(ctx, 40,20, 0,255,0,255, "40,20", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.linear.nonfinite.html b/content/canvas/test/test_2d.gradient.linear.nonfinite.html
new file mode 100644
index 000000000000..d55bcf197acf
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.linear.nonfinite.html
@@ -0,0 +1,91 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.linear.nonfinite</title>
+<!-- Testing: createLinearGradient() throws NOT_SUPPORTED_ERR if arguments are not finite -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, 0, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(-Infinity, 0, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(NaN, 0, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, Infinity, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, -Infinity, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, NaN, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, Infinity, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, -Infinity, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, NaN, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, 1, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, 1, -Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, 1, NaN);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, Infinity, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, Infinity, Infinity, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, Infinity, 1, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, 0, Infinity, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, 0, 1, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, Infinity, Infinity, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, Infinity, 1, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.linear.transform.1.html b/content/canvas/test/test_2d.gradient.linear.transform.1.html
new file mode 100644
index 000000000000..0e1e924786fe
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.linear.transform.1.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.linear.transform.1</title>
+<!-- Testing: Linear gradient coordinates are relative to the coordinate space at the time of filling -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createLinearGradient(0, 0, 200, 0);
+g.addColorStop(0, '#f00');
+g.addColorStop(0.25, '#0f0');
+g.addColorStop(0.75, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.translate(-50, 0);
+ctx.fillRect(50, 0, 100, 50);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.linear.transform.2.html b/content/canvas/test/test_2d.gradient.linear.transform.2.html
new file mode 100644
index 000000000000..24a63fc316de
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.linear.transform.2.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.linear.transform.2</title>
+<!-- Testing: Linear gradient coordinates are relative to the coordinate space at the time of filling -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.translate(100, 0);
+var g = ctx.createLinearGradient(0, 0, 200, 0);
+g.addColorStop(0, '#f00');
+g.addColorStop(0.25, '#0f0');
+g.addColorStop(0.75, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.translate(-150, 0);
+ctx.fillRect(50, 0, 100, 50);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.linear.transform.3.html b/content/canvas/test/test_2d.gradient.linear.transform.3.html
new file mode 100644
index 000000000000..0ca42f477f46
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.linear.transform.3.html
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.linear.transform.3</title>
+<!-- Testing: Linear gradient transforms do not experience broken caching effects -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createLinearGradient(0, 0, 200, 0);
+g.addColorStop(0, '#f00');
+g.addColorStop(0.25, '#0f0');
+g.addColorStop(0.75, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+ctx.translate(-50, 0);
+ctx.fillRect(50, 0, 100, 50);
+todo_isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.object.compare.html b/content/canvas/test/test_2d.gradient.object.compare.html
index 4e7f909a34ad..a60fa8a5d2f1 100644
--- a/content/canvas/test/test_2d.gradient.object.compare.html
+++ b/content/canvas/test/test_2d.gradient.object.compare.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.gradient.object.compare</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -20,7 +19,8 @@ ok(g1 !== g2, "g1 !== g2");
 ctx.fillStyle = g1;
 ok(ctx.fillStyle === g1, "ctx.fillStyle === g1");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.object.crosscanvas.html b/content/canvas/test/test_2d.gradient.object.crosscanvas.html
index fe3b9d5e44b1..cfb8260c1726 100644
--- a/content/canvas/test/test_2d.gradient.object.crosscanvas.html
+++ b/content/canvas/test/test_2d.gradient.object.crosscanvas.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.object.crosscanvas</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +34,8 @@ ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.object.invalidcolour.html b/content/canvas/test/test_2d.gradient.object.invalidcolour.html
index a309dce252ae..09f68181a7a1 100644
--- a/content/canvas/test/test_2d.gradient.object.invalidcolour.html
+++ b/content/canvas/test/test_2d.gradient.object.invalidcolour.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.gradient.object.invalidcolour</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -22,7 +21,8 @@ var _thrown = undefined; try {
   g.addColorStop(0, 'undefined');
 } catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.object.invalidoffset.html b/content/canvas/test/test_2d.gradient.object.invalidoffset.html
index 92d23095b96f..3b504c93178e 100644
--- a/content/canvas/test/test_2d.gradient.object.invalidoffset.html
+++ b/content/canvas/test/test_2d.gradient.object.invalidoffset.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.gradient.object.invalidoffset</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -23,15 +22,16 @@ var _thrown = undefined; try {
 } catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
 var _thrown = undefined; try {
   g.addColorStop(Infinity, '#000');
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
 var _thrown = undefined; try {
   g.addColorStop(-Infinity, '#000');
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
 var _thrown = undefined; try {
   g.addColorStop(NaN, '#000');
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.object.return.html b/content/canvas/test/test_2d.gradient.object.return.html
index e13871c3466a..5533a9c07085 100644
--- a/content/canvas/test/test_2d.gradient.object.return.html
+++ b/content/canvas/test/test_2d.gradient.object.return.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.gradient.object.return</title>
+<!-- Testing: createLinearGradient() and createRadialGradient() returns objects implementing CanvasGradient -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,15 +14,18 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+window.CanvasGradient.prototype.thisImplementsCanvasGradient = true;
+
 var g1 = ctx.createLinearGradient(0, 0, 100, 0);
-ok(Object.prototype.toString.call(g1) === '[object CanvasGradient]', "Object.prototype.toString.call(g1) === '[object CanvasGradient]'");
 ok(g1.addColorStop !== undefined, "g1.addColorStop !== undefined");
+ok(g1.thisImplementsCanvasGradient === true, "g1.thisImplementsCanvasGradient === true");
 
 var g2 = ctx.createRadialGradient(0, 0, 10, 0, 0, 20);
-ok(Object.prototype.toString.call(g2) === '[object CanvasGradient]', "Object.prototype.toString.call(g2) === '[object CanvasGradient]'");
 ok(g2.addColorStop !== undefined, "g2.addColorStop !== undefined");
+ok(g2.thisImplementsCanvasGradient === true, "g2.thisImplementsCanvasGradient === true");
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.object.type.html b/content/canvas/test/test_2d.gradient.object.type.html
new file mode 100644
index 000000000000..435979ae3c5b
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.object.type.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.object.type</title>
+<!-- Testing: window.CanvasGradient exists and has the right properties -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ok(window.CanvasGradient !== undefined, "window.CanvasGradient !== undefined");
+ok(window.CanvasGradient.prototype.addColorStop !== undefined, "window.CanvasGradient.prototype.addColorStop !== undefined");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.object.update.html b/content/canvas/test/test_2d.gradient.object.update.html
index c7e12d3640ad..23baf6214ed5 100644
--- a/content/canvas/test/test_2d.gradient.object.update.html
+++ b/content/canvas/test/test_2d.gradient.object.update.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.object.update</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +34,8 @@ g.addColorStop(0.9, '#0f0');
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.behind.html b/content/canvas/test/test_2d.gradient.radial.cone.behind.html
new file mode 100644
index 000000000000..92fc98605a03
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.radial.cone.behind.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.cone.behind</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(120, 25, 10, 211, 25, 100);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.beside.html b/content/canvas/test/test_2d.gradient.radial.cone.beside.html
new file mode 100644
index 000000000000..39c27ddde30e
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.radial.cone.beside.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.cone.beside</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(0, 100, 40, 100, 100, 50);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.bottom.html b/content/canvas/test/test_2d.gradient.radial.cone.bottom.html
index f7e8e3ce7392..2507be5aa8f1 100644
--- a/content/canvas/test/test_2d.gradient.radial.cone.bottom.html
+++ b/content/canvas/test/test_2d.gradient.radial.cone.bottom.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.radial.cone.bottom</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -45,7 +44,8 @@ isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.cylinder.html b/content/canvas/test/test_2d.gradient.radial.cone.cylinder.html
index f43a6719f57c..f5dd8e7a64a5 100644
--- a/content/canvas/test/test_2d.gradient.radial.cone.cylinder.html
+++ b/content/canvas/test/test_2d.gradient.radial.cone.cylinder.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.radial.cone.cylinder</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -45,7 +44,8 @@ isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.front.html b/content/canvas/test/test_2d.gradient.radial.cone.front.html
index ea8d33c036a6..f7625fdb71c3 100644
--- a/content/canvas/test/test_2d.gradient.radial.cone.front.html
+++ b/content/canvas/test/test_2d.gradient.radial.cone.front.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.radial.cone.front</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,17 +34,18 @@ g.addColorStop(1, '#0f0');
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 1);
-isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 1);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 1);
-isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 1);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 1);
-isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 1);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 1);
-isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 1);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 1);
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.shape1.html b/content/canvas/test/test_2d.gradient.radial.cone.shape1.html
index 158d42261de8..ef3b303d3d09 100644
--- a/content/canvas/test/test_2d.gradient.radial.cone.shape1.html
+++ b/content/canvas/test/test_2d.gradient.radial.cone.shape1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.radial.cone.shape1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -54,7 +53,8 @@ isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.shape2.html b/content/canvas/test/test_2d.gradient.radial.cone.shape2.html
new file mode 100644
index 000000000000..5e18c92b00c9
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.radial.cone.shape2.html
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.cone.shape2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var tol = 1; // tolerance to avoid antialiasing artifacts
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(30+10*5/2, 40, 10*3/2, 30+10*15/4, 40, 10*9/4);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(30-tol, 40);
+ctx.lineTo(110, -20-tol);
+ctx.lineTo(110, 100+tol);
+ctx.fill();
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.top.html b/content/canvas/test/test_2d.gradient.radial.cone.top.html
index 50b0e2e4bd46..b21fd5f83daf 100644
--- a/content/canvas/test/test_2d.gradient.radial.cone.top.html
+++ b/content/canvas/test/test_2d.gradient.radial.cone.top.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.radial.cone.top</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,17 +34,18 @@ g.addColorStop(1, '#0f0');
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 1);
-isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 1);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 1);
-isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 1);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 1);
-isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 1);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 1);
-isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 1);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 1);
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.radial.equal.html b/content/canvas/test/test_2d.gradient.radial.equal.html
new file mode 100644
index 000000000000..365cf6b9dfff
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.radial.equal.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.equal</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(50, 25, 20, 50, 25, 20);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.radial.inside1.html b/content/canvas/test/test_2d.gradient.radial.inside1.html
index 6b29177e951a..cadaa3e95b14 100644
--- a/content/canvas/test/test_2d.gradient.radial.inside1.html
+++ b/content/canvas/test/test_2d.gradient.radial.inside1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.radial.inside1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -45,7 +44,8 @@ isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.radial.inside2.html b/content/canvas/test/test_2d.gradient.radial.inside2.html
index 91c5d6647f44..c73686125370 100644
--- a/content/canvas/test/test_2d.gradient.radial.inside2.html
+++ b/content/canvas/test/test_2d.gradient.radial.inside2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.radial.inside2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,17 +34,18 @@ g.addColorStop(1, '#0f0');
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2);
-isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 2);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2);
-isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 2);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 2);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2);
-isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 2);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2);
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.radial.inside3.html b/content/canvas/test/test_2d.gradient.radial.inside3.html
index 5e52c8d80a02..b3f0de9529ca 100644
--- a/content/canvas/test/test_2d.gradient.radial.inside3.html
+++ b/content/canvas/test/test_2d.gradient.radial.inside3.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.radial.inside3</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -46,7 +45,8 @@ isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.radial.negative.html b/content/canvas/test/test_2d.gradient.radial.negative.html
index 3b0ecc2bae64..803416637f09 100644
--- a/content/canvas/test/test_2d.gradient.radial.negative.html
+++ b/content/canvas/test/test_2d.gradient.radial.negative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.gradient.radial.negative</title>
+<!-- Testing: createRadialGradient() throws INDEX_SIZE_ERR if either radius is negative -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -20,8 +20,12 @@ var _thrown = undefined; try {
 var _thrown = undefined; try {
   ctx.createRadialGradient(0, 0, 1, 0, 0, -0.1);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, -0.1, 0, 0, -0.1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.radial.nonfinite.html b/content/canvas/test/test_2d.gradient.radial.nonfinite.html
new file mode 100644
index 000000000000..bddd15eb56bf
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.radial.nonfinite.html
@@ -0,0 +1,247 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.nonfinite</title>
+<!-- Testing: createRadialGradient() throws NOT_SUPPORTED_ERR if arguments are not finite -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(-Infinity, 0, 1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(NaN, 0, 1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, -Infinity, 1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, NaN, 1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, -Infinity, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, NaN, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, -Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, NaN, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, -Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, NaN, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, 0, -Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, 0, NaN);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.radial.outside1.html b/content/canvas/test/test_2d.gradient.radial.outside1.html
index 9b028131d4a3..06c18f028707 100644
--- a/content/canvas/test/test_2d.gradient.radial.outside1.html
+++ b/content/canvas/test/test_2d.gradient.radial.outside1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.gradient.radial.outside1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,19 +34,18 @@ g.addColorStop(1, '#0f0');
 ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 
-// These are tolerance 10 because Quartz has issues with smooth
-// interpolation due to numercial precision
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 10);
-isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 10);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 10);
-isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 10);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 10);
-isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 10);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 10);
-isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 10);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 10);
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.gradient.radial.outside2.html b/content/canvas/test/test_2d.gradient.radial.outside2.html
new file mode 100644
index 000000000000..09f18d7521be
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.radial.outside2.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.outside2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(200, 25, 20, 200, 25, 10);
+g.addColorStop(0, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.radial.outside3.html b/content/canvas/test/test_2d.gradient.radial.outside3.html
new file mode 100644
index 000000000000..628a471d6a3b
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.radial.outside3.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.outside3</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(200, 25, 20, 200, 25, 10);
+g.addColorStop(0, '#0f0');
+g.addColorStop(0.001, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.radial.touch1.html b/content/canvas/test/test_2d.gradient.radial.touch1.html
new file mode 100644
index 000000000000..ee2c2c3a1e57
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.radial.touch1.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.touch1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(150, 25, 50, 200, 25, 100);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.radial.touch2.html b/content/canvas/test/test_2d.gradient.radial.touch2.html
new file mode 100644
index 000000000000..dcabd3668736
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.radial.touch2.html
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.touch2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(-80, 25, 70, 0, 25, 150);
+g.addColorStop(0, '#f00');
+g.addColorStop(0.01, '#0f0');
+g.addColorStop(0.99, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.radial.touch3.html b/content/canvas/test/test_2d.gradient.radial.touch3.html
new file mode 100644
index 000000000000..6382c24628fa
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.radial.touch3.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.touch3</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(120, -15, 25, 140, -30, 50);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.radial.transform.1.html b/content/canvas/test/test_2d.gradient.radial.transform.1.html
new file mode 100644
index 000000000000..62b47828cb9f
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.radial.transform.1.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.transform.1</title>
+<!-- Testing: Radial gradient coordinates are relative to the coordinate space at the time of filling -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2);
+g.addColorStop(0, '#0f0');
+g.addColorStop(0.5, '#0f0');
+g.addColorStop(0.51, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.translate(50, 25);
+ctx.scale(10, 10);
+ctx.fillRect(-5, -2.5, 10, 5);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.radial.transform.2.html b/content/canvas/test/test_2d.gradient.radial.transform.2.html
new file mode 100644
index 000000000000..1d760b8fc614
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.radial.transform.2.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.transform.2</title>
+<!-- Testing: Radial gradient coordinates are relative to the coordinate space at the time of filling -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.translate(100, 0);
+var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2);
+g.addColorStop(0, '#0f0');
+g.addColorStop(0.5, '#0f0');
+g.addColorStop(0.51, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.translate(-50, 25);
+ctx.scale(10, 10);
+ctx.fillRect(-5, -2.5, 10, 5);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.radial.transform.3.html b/content/canvas/test/test_2d.gradient.radial.transform.3.html
new file mode 100644
index 000000000000..1cc978749a4c
--- /dev/null
+++ b/content/canvas/test/test_2d.gradient.radial.transform.3.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.transform.3</title>
+<!-- Testing: Radial gradient transforms do not experience broken caching effects -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2);
+g.addColorStop(0, '#0f0');
+g.addColorStop(0.5, '#0f0');
+g.addColorStop(0.51, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+ctx.translate(50, 25);
+ctx.scale(10, 10);
+ctx.fillRect(-5, -2.5, 10, 5);
+todo_isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.create.basic.html b/content/canvas/test/test_2d.imageData.create.basic.html
new file mode 100644
index 000000000000..d190785eea1d
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.create.basic.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.create.basic - bug 433004</title>
+<!-- Testing: createImageData() exists and returns something -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ok(ctx.createImageData(1, 1) !== null, "ctx.createImageData(1, 1) !== null");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.create.initial.html b/content/canvas/test/test_2d.imageData.create.initial.html
new file mode 100644
index 000000000000..768b9e419031
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.create.initial.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.create.initial - bug 433004</title>
+<!-- Testing: createImageData() returns transparent black data of the right size -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var imgdata = ctx.createImageData(10, 20);
+ok(imgdata.data.length == imgdata.width*imgdata.height*4, "imgdata.data.length == imgdata.width*imgdata.height*4");
+ok(imgdata.width < imgdata.height, "imgdata.width < imgdata.height");
+ok(imgdata.width > 0, "imgdata.width > 0");
+var isTransparentBlack = true;
+for (var i = 0; i < imgdata.data.length; ++i)
+    if (imgdata.data[i] !== 0)
+        isTransparentBlack = false;
+ok(isTransparentBlack, "isTransparentBlack");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.create.large.html b/content/canvas/test/test_2d.imageData.create.large.html
new file mode 100644
index 000000000000..3b7b7f790c95
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.create.large.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.create.large - bug 433004</title>
+<!-- Testing: createImageData() works for sizes much larger than the canvas -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var imgdata = ctx.createImageData(1000, 2000);
+ok(imgdata.data.length == imgdata.width*imgdata.height*4, "imgdata.data.length == imgdata.width*imgdata.height*4");
+ok(imgdata.width < imgdata.height, "imgdata.width < imgdata.height");
+ok(imgdata.width > 0, "imgdata.width > 0");
+var isTransparentBlack = true;
+for (var i = 0; i < imgdata.data.length; i += 7813) // check ~1024 points (assuming normal scaling)
+    if (imgdata.data[i] !== 0)
+        isTransparentBlack = false;
+ok(isTransparentBlack, "isTransparentBlack");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.create.negative.html b/content/canvas/test/test_2d.imageData.create.negative.html
new file mode 100644
index 000000000000..b4a44704c120
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.create.negative.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.create.negative - bug 433004</title>
+<!-- Testing: createImageData() takes the absolute magnitude of the size arguments -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var imgdata1 = ctx.createImageData(10, 20);
+var imgdata2 = ctx.createImageData(-10, 20);
+var imgdata3 = ctx.createImageData(10, -20);
+var imgdata4 = ctx.createImageData(-10, -20);
+ok(imgdata1.data.length == imgdata2.data.length, "imgdata1.data.length == imgdata2.data.length");
+ok(imgdata2.data.length == imgdata3.data.length, "imgdata2.data.length == imgdata3.data.length");
+ok(imgdata3.data.length == imgdata4.data.length, "imgdata3.data.length == imgdata4.data.length");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.gradient.radial.invalid.html b/content/canvas/test/test_2d.imageData.create.nonfinite.html
similarity index 66%
rename from content/canvas/test/test_2d.gradient.radial.invalid.html
rename to content/canvas/test/test_2d.imageData.create.nonfinite.html
index e1bc9a74006b..dca59d9adbd2 100644
--- a/content/canvas/test/test_2d.gradient.radial.invalid.html
+++ b/content/canvas/test/test_2d.imageData.create.nonfinite.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.radial.invalid</title>
+<title>Canvas test: 2d.imageData.create.nonfinite - bug 433004</title>
+<!-- Testing: createImageData() throws NOT_SUPPORTED_ERR if arguments are not finite -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -15,31 +15,29 @@ var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
 var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, 1, 0, 0, 1);
+  ctx.createImageData(Infinity, 10);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, 1, 0, 0, 1);
+  ctx.createImageData(-Infinity, 10);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, Infinity, 0, 0, 1);
+  ctx.createImageData(NaN, 10);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, Infinity, 0, 1);
+  ctx.createImageData(10, Infinity);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, 0, Infinity, 1);
+  ctx.createImageData(10, -Infinity);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, 0, 0, Infinity);
+  ctx.createImageData(10, NaN);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, -Infinity, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, NaN, 0, 0, 1);
+  ctx.createImageData(Infinity, Infinity);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.create.round.html b/content/canvas/test/test_2d.imageData.create.round.html
new file mode 100644
index 000000000000..3837f41b31ec
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.create.round.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.create.round - bug 433004</title>
+<!-- Testing: createImageData(w, h) is rounded the same as getImageData(0, 0, w, h) -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var imgdata1 = ctx.createImageData(10.01, 10.99);
+var imgdata2 = ctx.getImageData(0, 0, 10.01, 10.99);
+ok(imgdata1.width == imgdata2.width, "imgdata1.width == imgdata2.width");
+ok(imgdata1.height == imgdata2.height, "imgdata1.height == imgdata2.height");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.create.tiny.html b/content/canvas/test/test_2d.imageData.create.tiny.html
new file mode 100644
index 000000000000..6fb44e27d2e8
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.create.tiny.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.create.tiny - bug 433004</title>
+<!-- Testing: createImageData() works for sizes smaller than one pixel -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var imgdata = ctx.createImageData(0.0001, 0.0001);
+ok(imgdata.data.length == imgdata.width*imgdata.height*4, "imgdata.data.length == imgdata.width*imgdata.height*4");
+ok(imgdata.width == 1, "imgdata.width == 1");
+ok(imgdata.height == 1, "imgdata.height == 1");
+var isTransparentBlack = true;
+for (var i = 0; i < imgdata.data.length; ++i)
+    if (imgdata.data[i] !== 0)
+        isTransparentBlack = false;
+ok(isTransparentBlack, "isTransparentBlack");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.create.type.html b/content/canvas/test/test_2d.imageData.create.type.html
new file mode 100644
index 000000000000..aa676f1aad65
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.create.type.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.create.type - bug 433004</title>
+<!-- Testing: createImageData() returns an ImageData object containing a CanvasPixelArray object -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+todo(window.ImageData !== undefined, "window.ImageData !== undefined");
+todo(window.CanvasPixelArray !== undefined, "window.CanvasPixelArray !== undefined");
+window.ImageData.prototype.thisImplementsImageData = true;
+window.CanvasPixelArray.prototype.thisImplementsCanvasPixelArray = true;
+var imgdata = ctx.createImageData(1, 1);
+ok(imgdata.thisImplementsImageData, "imgdata.thisImplementsImageData");
+ok(imgdata.data.thisImplementsCanvasPixelArray, "imgdata.data.thisImplementsCanvasPixelArray");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.create.zero.html b/content/canvas/test/test_2d.imageData.create.zero.html
new file mode 100644
index 000000000000..90a94fb3f6b0
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.create.zero.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.create.zero - bug 433004</title>
+<!-- Testing: createImageData() throws INDEX_SIZE_ERR if size is zero -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createImageData(10, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.createImageData(0, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.createImageData(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.get.basic.html b/content/canvas/test/test_2d.imageData.get.basic.html
index 53f23bd181bc..ba4b02175e51 100644
--- a/content/canvas/test/test_2d.imageData.get.basic.html
+++ b/content/canvas/test/test_2d.imageData.get.basic.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.imageData.get.basic</title>
+<!-- Testing: getImageData() exists and returns something -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(ctx.getImageData(0, 0, 100, 50) !== null, "ctx.getImageData(0, 0, 100, 50) !== null");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.get.clamp.html b/content/canvas/test/test_2d.imageData.get.clamp.html
new file mode 100644
index 000000000000..ed62ed5d7c25
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.get.clamp.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.clamp</title>
+<!-- Testing: getImageData() clamps colours to the range [0, 255] -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = 'rgb(-100, -200, -300)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = 'rgb(256, 300, 400)';
+ctx.fillRect(20, 10, 60, 10);
+var imgdata1 = ctx.getImageData(10, 5, 1, 1);
+ok(imgdata1.data[0] === 0, "imgdata1.data[\""+(0)+"\"] === 0");
+ok(imgdata1.data[1] === 0, "imgdata1.data[\""+(1)+"\"] === 0");
+ok(imgdata1.data[2] === 0, "imgdata1.data[\""+(2)+"\"] === 0");
+var imgdata2 = ctx.getImageData(30, 15, 1, 1);
+ok(imgdata2.data[0] === 255, "imgdata2.data[\""+(0)+"\"] === 255");
+ok(imgdata2.data[1] === 255, "imgdata2.data[\""+(1)+"\"] === 255");
+ok(imgdata2.data[2] === 255, "imgdata2.data[\""+(2)+"\"] === 255");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.get.nonfinite.html b/content/canvas/test/test_2d.imageData.get.nonfinite.html
index c10fc2fb5b4b..15be4c3818f6 100644
--- a/content/canvas/test/test_2d.imageData.get.nonfinite.html
+++ b/content/canvas/test/test_2d.imageData.get.nonfinite.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.imageData.get.nonfinite</title>
+<!-- Testing: getImageData() throws NOT_SUPPORTED_ERR if arguments are not finite -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -15,43 +15,77 @@ var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
 var _thrown = undefined; try {
-  ctx.getImageData(Infinity, 10, 1, 1);
+  ctx.getImageData(Infinity, 10, 10, 10);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(10, Infinity, 1, 1);
+  ctx.getImageData(-Infinity, 10, 10, 10);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(10, 10, Infinity, 1);
+  ctx.getImageData(NaN, 10, 10, 10);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(10, 10, 1, Infinity);
+  ctx.getImageData(10, Infinity, 10, 10);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(-Infinity, 10, 1, 1);
+  ctx.getImageData(10, -Infinity, 10, 10);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(10, -Infinity, 1, 1);
+  ctx.getImageData(10, NaN, 10, 10);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(10, 10, -Infinity, 1);
+  ctx.getImageData(10, 10, Infinity, 10);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(10, 10, 1, -Infinity);
+  ctx.getImageData(10, 10, -Infinity, 10);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(NaN, 10, 1, 1);
+  ctx.getImageData(10, 10, NaN, 10);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(10, NaN, 1, 1);
+  ctx.getImageData(10, 10, 10, Infinity);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(10, 10, NaN, 1);
+  ctx.getImageData(10, 10, 10, -Infinity);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(10, 10, 1, NaN);
+  ctx.getImageData(10, 10, 10, NaN);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, 10, Infinity, Infinity);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.get.nonpremul.html b/content/canvas/test/test_2d.imageData.get.nonpremul.html
index 53b6867f55a3..6313c7c30e68 100644
--- a/content/canvas/test/test_2d.imageData.get.nonpremul.html
+++ b/content/canvas/test/test_2d.imageData.get.nonpremul.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.imageData.get.nonpremul</title>
+<!-- Testing: getImageData() returns non-premultiplied colours -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -23,7 +23,8 @@ ok(imgdata.data[2] > 200, "imgdata.data[\""+(2)+"\"] > 200");
 ok(imgdata.data[3] > 100, "imgdata.data[\""+(3)+"\"] > 100");
 ok(imgdata.data[3] < 200, "imgdata.data[\""+(3)+"\"] < 200");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.get.order.alpha.html b/content/canvas/test/test_2d.imageData.get.order.alpha.html
index 23e6c3c8f354..f70816053e77 100644
--- a/content/canvas/test/test_2d.imageData.get.order.alpha.html
+++ b/content/canvas/test/test_2d.imageData.get.order.alpha.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.imageData.get.order.alpha</title>
+<!-- Testing: getImageData() returns A in the fourth component -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -20,7 +20,8 @@ var imgdata = ctx.getImageData(0, 0, 10, 10);
 ok(imgdata.data[3] < 200, "imgdata.data[\""+(3)+"\"] < 200");
 ok(imgdata.data[3] > 100, "imgdata.data[\""+(3)+"\"] > 100");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.get.order.cols.html b/content/canvas/test/test_2d.imageData.get.order.cols.html
index 605c5107d755..bfa2294492b9 100644
--- a/content/canvas/test/test_2d.imageData.get.order.cols.html
+++ b/content/canvas/test/test_2d.imageData.get.order.cols.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.imageData.get.order.cols</title>
+<!-- Testing: getImageData() returns leftmost columns first -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -20,10 +20,11 @@ ctx.fillStyle = '#000';
 ctx.fillRect(0, 0, 2, 50);
 var imgdata = ctx.getImageData(0, 0, 10, 10);
 ok(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
-ok(imgdata.data[Math.floor(imgdata.width/2*4)] === 255, "imgdata.data[Math.floor(imgdata.width/2*4)] === 255");
-ok(imgdata.data[(imgdata.height/2)*imgdata.width*4] === 0, "imgdata.data[(imgdata.height/2)*imgdata.width*4] === 0");
+ok(imgdata.data[Math.round(imgdata.width/2*4)] === 255, "imgdata.data[Math.round(imgdata.width/2*4)] === 255");
+ok(imgdata.data[Math.round((imgdata.height/2)*imgdata.width*4)] === 0, "imgdata.data[Math.round((imgdata.height/2)*imgdata.width*4)] === 0");
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.get.order.rgb.html b/content/canvas/test/test_2d.imageData.get.order.rgb.html
index 0c3cffc4d34d..4e0cc3398241 100644
--- a/content/canvas/test/test_2d.imageData.get.order.rgb.html
+++ b/content/canvas/test/test_2d.imageData.get.order.rgb.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.imageData.get.order.rgb</title>
+<!-- Testing: getImageData() returns R then G then B -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -22,7 +22,8 @@ ok(imgdata.data[1] === 0x88, "imgdata.data[\""+(1)+"\"] === 0x88");
 ok(imgdata.data[2] === 0xCC, "imgdata.data[\""+(2)+"\"] === 0xCC");
 ok(imgdata.data[3] === 255, "imgdata.data[\""+(3)+"\"] === 255");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.get.order.rows.html b/content/canvas/test/test_2d.imageData.get.order.rows.html
index efb340076445..67ddf53aaccc 100644
--- a/content/canvas/test/test_2d.imageData.get.order.rows.html
+++ b/content/canvas/test/test_2d.imageData.get.order.rows.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.imageData.get.order.rows</title>
+<!-- Testing: getImageData() returns topmost rows first -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -23,7 +23,8 @@ ok(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
 ok(imgdata.data[Math.floor(imgdata.width/2*4)] === 0, "imgdata.data[Math.floor(imgdata.width/2*4)] === 0");
 ok(imgdata.data[(imgdata.height/2)*imgdata.width*4] === 255, "imgdata.data[(imgdata.height/2)*imgdata.width*4] === 255");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.get.values.html b/content/canvas/test/test_2d.imageData.get.range.html
similarity index 70%
rename from content/canvas/test/test_2d.imageData.get.values.html
rename to content/canvas/test/test_2d.imageData.get.range.html
index ce8b9587ff5d..d56594fdcc3a 100644
--- a/content/canvas/test/test_2d.imageData.get.values.html
+++ b/content/canvas/test/test_2d.imageData.get.range.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.values</title>
+<title>Canvas test: 2d.imageData.get.range</title>
+<!-- Testing: getImageData() returns values in the range [0, 255] -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,13 +17,14 @@ var ctx = canvas.getContext('2d');
 ctx.fillStyle = '#000';
 ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#fff';
-ctx.fillRect(20, 10, 60, 30);
+ctx.fillRect(20, 10, 60, 10);
 var imgdata1 = ctx.getImageData(10, 5, 1, 1);
 ok(imgdata1.data[0] === 0, "imgdata1.data[\""+(0)+"\"] === 0");
-var imgdata2 = ctx.getImageData(30, 20, 1, 1);
+var imgdata2 = ctx.getImageData(30, 15, 1, 1);
 ok(imgdata2.data[0] === 255, "imgdata2.data[\""+(0)+"\"] === 255");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.get.smallest.html b/content/canvas/test/test_2d.imageData.get.smallest.html
deleted file mode 100644
index ada45319cd86..000000000000
--- a/content/canvas/test/test_2d.imageData.get.smallest.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.smallest</title>
-<script src="/MochiKit/MochiKit.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-var _deferred = false;
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var imgdata = ctx.getImageData(0, 0, 1, 1);
-ok(imgdata.width > 0, "imgdata.width > 0");
-ok(imgdata.height > 0, "imgdata.height > 0");
-ok(imgdata.data.length === imgdata.width*imgdata.height*4, "imgdata.data.length === imgdata.width*imgdata.height*4");
-
-if (!_deferred) SimpleTest.finish();
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.source.negative.html b/content/canvas/test/test_2d.imageData.get.source.negative.html
new file mode 100644
index 000000000000..fd62d2f9448d
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.get.source.negative.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.source.negative</title>
+<!-- Testing: getImageData() works with negative width and height -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#000';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#fff';
+ctx.fillRect(20, 10, 60, 10);
+
+var imgdata1 = ctx.getImageData(85, 25, -10, -10);
+ok(imgdata1.data[0] === 0, "imgdata1.data[\""+(0)+"\"] === 0");
+ok(imgdata1.data[1] === 0, "imgdata1.data[\""+(1)+"\"] === 0");
+ok(imgdata1.data[2] === 0, "imgdata1.data[\""+(2)+"\"] === 0");
+ok(imgdata1.data[3] === 255, "imgdata1.data[\""+(3)+"\"] === 255");
+ok(imgdata1.data[imgdata1.length-4+0] === 255, "imgdata1.data[imgdata1.length-4+0] === 255");
+ok(imgdata1.data[imgdata1.length-4+1] === 255, "imgdata1.data[imgdata1.length-4+1] === 255");
+ok(imgdata1.data[imgdata1.length-4+2] === 255, "imgdata1.data[imgdata1.length-4+2] === 255");
+ok(imgdata1.data[imgdata1.length-4+3] === 255, "imgdata1.data[imgdata1.length-4+3] === 255");
+
+var imgdata2 = ctx.getImageData(0, 0, -1, -1);
+ok(imgdata2.data[0] === 0, "imgdata2.data[\""+(0)+"\"] === 0");
+ok(imgdata2.data[1] === 0, "imgdata2.data[\""+(1)+"\"] === 0");
+ok(imgdata2.data[2] === 0, "imgdata2.data[\""+(2)+"\"] === 0");
+ok(imgdata2.data[3] === 0, "imgdata2.data[\""+(3)+"\"] === 0");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.get.source.outside.html b/content/canvas/test/test_2d.imageData.get.source.outside.html
new file mode 100644
index 000000000000..df9cd81c5c5e
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.get.source.outside.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.source.outside</title>
+<!-- Testing: getImageData() returns transparent black outside the canvas -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#08f';
+ctx.fillRect(0, 0, 100, 50);
+
+var imgdata1 = ctx.getImageData(-10, 5, 1, 1);
+ok(imgdata1.data[0] === 0, "imgdata1.data[\""+(0)+"\"] === 0");
+ok(imgdata1.data[1] === 0, "imgdata1.data[\""+(1)+"\"] === 0");
+ok(imgdata1.data[2] === 0, "imgdata1.data[\""+(2)+"\"] === 0");
+ok(imgdata1.data[3] === 0, "imgdata1.data[\""+(3)+"\"] === 0");
+
+var imgdata2 = ctx.getImageData(10, -5, 1, 1);
+ok(imgdata2.data[0] === 0, "imgdata2.data[\""+(0)+"\"] === 0");
+ok(imgdata2.data[1] === 0, "imgdata2.data[\""+(1)+"\"] === 0");
+ok(imgdata2.data[2] === 0, "imgdata2.data[\""+(2)+"\"] === 0");
+ok(imgdata2.data[3] === 0, "imgdata2.data[\""+(3)+"\"] === 0");
+
+var imgdata3 = ctx.getImageData(200, 5, 1, 1);
+ok(imgdata3.data[0] === 0, "imgdata3.data[\""+(0)+"\"] === 0");
+ok(imgdata3.data[1] === 0, "imgdata3.data[\""+(1)+"\"] === 0");
+ok(imgdata3.data[2] === 0, "imgdata3.data[\""+(2)+"\"] === 0");
+ok(imgdata3.data[3] === 0, "imgdata3.data[\""+(3)+"\"] === 0");
+
+var imgdata4 = ctx.getImageData(10, 60, 1, 1);
+ok(imgdata4.data[0] === 0, "imgdata4.data[\""+(0)+"\"] === 0");
+ok(imgdata4.data[1] === 0, "imgdata4.data[\""+(1)+"\"] === 0");
+ok(imgdata4.data[2] === 0, "imgdata4.data[\""+(2)+"\"] === 0");
+ok(imgdata4.data[3] === 0, "imgdata4.data[\""+(3)+"\"] === 0");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.get.sourcesize.html b/content/canvas/test/test_2d.imageData.get.source.size.html
similarity index 74%
rename from content/canvas/test/test_2d.imageData.get.sourcesize.html
rename to content/canvas/test/test_2d.imageData.get.source.size.html
index 709370f1ef59..dbc23dbf5f59 100644
--- a/content/canvas/test/test_2d.imageData.get.sourcesize.html
+++ b/content/canvas/test/test_2d.imageData.get.source.size.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.sourcesize</title>
+<title>Canvas test: 2d.imageData.get.source.size</title>
+<!-- Testing: getImageData() returns bigger ImageData for bigger source rectangle -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -19,7 +19,8 @@ var imgdata2 = ctx.getImageData(0, 0, 20, 20);
 ok(imgdata2.width > imgdata1.width, "imgdata2.width > imgdata1.width");
 ok(imgdata2.height > imgdata1.height, "imgdata2.height > imgdata1.height");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.get.sourcepos.html b/content/canvas/test/test_2d.imageData.get.sourcepos.html
deleted file mode 100644
index acd1b21e02ec..000000000000
--- a/content/canvas/test/test_2d.imageData.get.sourcepos.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.sourcepos</title>
-<script src="/MochiKit/MochiKit.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-var _deferred = false;
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#000';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#fff';
-ctx.fillRect(20, 10, 60, 30);
-var imgdata1 = ctx.getImageData(10, 5, 1, 1);
-ok(imgdata1.data[0] < 50, "imgdata1.data[\""+(0)+"\"] < 50");
-var imgdata2 = ctx.getImageData(30, 20, 1, 1);
-ok(imgdata2.data[0] > 200, "imgdata2.data[\""+(0)+"\"] > 200");
-
-if (!_deferred) SimpleTest.finish();
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.tiny.html b/content/canvas/test/test_2d.imageData.get.tiny.html
new file mode 100644
index 000000000000..0c0b6692aa7a
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.get.tiny.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.tiny</title>
+<!-- Testing: getImageData() works for sizes smaller than one pixel -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var imgdata = ctx.getImageData(0, 0, 0.0001, 0.0001);
+ok(imgdata.data.length == imgdata.width*imgdata.height*4, "imgdata.data.length == imgdata.width*imgdata.height*4");
+ok(imgdata.width == 1, "imgdata.width == 1");
+ok(imgdata.height == 1, "imgdata.height == 1");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.get.type.html b/content/canvas/test/test_2d.imageData.get.type.html
new file mode 100644
index 000000000000..6e39aaa5382b
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.get.type.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.type</title>
+<!-- Testing: getImageData() returns an ImageData object containing a CanvasPixelArray object -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+todo(window.ImageData !== undefined, "window.ImageData !== undefined");
+todo(window.CanvasPixelArray !== undefined, "window.CanvasPixelArray !== undefined");
+window.ImageData.prototype.thisImplementsImageData = true;
+window.CanvasPixelArray.prototype.thisImplementsCanvasPixelArray = true;
+var imgdata = ctx.getImageData(0, 0, 1, 1);
+ok(imgdata.thisImplementsImageData, "imgdata.thisImplementsImageData");
+ok(imgdata.data.thisImplementsCanvasPixelArray, "imgdata.data.thisImplementsCanvasPixelArray");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.get.unaffected.html b/content/canvas/test/test_2d.imageData.get.unaffected.html
new file mode 100644
index 000000000000..18145593d862
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.get.unaffected.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.unaffected</title>
+<!-- Testing: getImageData() is not affected by context state -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50)
+ctx.fillStyle = '#f00';
+ctx.fillRect(50, 0, 50, 50)
+ctx.save();
+ctx.translate(50, 0);
+ctx.globalAlpha = 0.1;
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.shadowColor = '#f00';
+ctx.rect(0, 0, 5, 5);
+ctx.clip();
+var imgdata = ctx.getImageData(0, 0, 50, 50);
+ctx.restore();
+ctx.putImageData(imgdata, 50, 0);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.get.zero.html b/content/canvas/test/test_2d.imageData.get.zero.html
new file mode 100644
index 000000000000..4bb9a68a76da
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.get.zero.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.zero</title>
+<!-- Testing: getImageData() throws INDEX_SIZE_ERR if size is zero -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.getImageData(1, 1, 10, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(1, 1, 0, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(1, 1, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.object.clamp.html b/content/canvas/test/test_2d.imageData.object.clamp.html
new file mode 100644
index 000000000000..e43d7fad023e
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.object.clamp.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.object.clamp</title>
+<!-- Testing: ImageData.data clamps numbers to [0, 255] -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+
+imgdata.data[0] = 100;
+imgdata.data[0] = 300;
+todo(imgdata.data[0] === 255, "imgdata.data[\""+(0)+"\"] === 255");
+imgdata.data[0] = 100;
+imgdata.data[0] = -100;
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+
+imgdata.data[0] = 100;
+imgdata.data[0] = 200+Math.pow(2, 32);
+todo(imgdata.data[0] === 255, "imgdata.data[\""+(0)+"\"] === 255");
+imgdata.data[0] = 100;
+imgdata.data[0] = -200-Math.pow(2, 32);
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+
+imgdata.data[0] = 100;
+imgdata.data[0] = Math.pow(10, 39);
+todo(imgdata.data[0] === 255, "imgdata.data[\""+(0)+"\"] === 255");
+imgdata.data[0] = 100;
+imgdata.data[0] = -Math.pow(10, 39);
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+
+imgdata.data[0] = 100;
+imgdata.data[0] = -Infinity;
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+imgdata.data[0] = 100;
+imgdata.data[0] = Infinity;
+todo(imgdata.data[0] === 255, "imgdata.data[\""+(0)+"\"] === 255");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.object.ctor.html b/content/canvas/test/test_2d.imageData.object.ctor.html
new file mode 100644
index 000000000000..77e8144dbe00
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.object.ctor.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.object.ctor</title>
+<!-- Testing: ImageData does not have a usable constructor -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+todo(window.ImageData !== undefined, "window.ImageData !== undefined");
+try { var _thrown = false;
+  new window.ImageData(1,1);
+} catch (e) { _thrown = true; } finally { ok(_thrown, "should throw exception"); }
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.object.nan.html b/content/canvas/test/test_2d.imageData.object.nan.html
new file mode 100644
index 000000000000..4a60b2b63973
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.object.nan.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.object.nan</title>
+<!-- Testing: ImageData.data converts NaN to 0 -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+imgdata.data[0] = 100;
+imgdata.data[0] = NaN;
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+imgdata.data[0] = 100;
+imgdata.data[0] = "cheese";
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.get.properties.html b/content/canvas/test/test_2d.imageData.object.properties.html
similarity index 63%
rename from content/canvas/test/test_2d.imageData.get.properties.html
rename to content/canvas/test/test_2d.imageData.object.properties.html
index 7c12bcb62340..72590f89adfe 100644
--- a/content/canvas/test/test_2d.imageData.get.properties.html
+++ b/content/canvas/test/test_2d.imageData.object.properties.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.properties</title>
+<title>Canvas test: 2d.imageData.object.properties</title>
+<!-- Testing: ImageData objects have the right properties -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,13 +14,13 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-var imgdata = ctx.getImageData(0, 0, 100, 50);
+var imgdata = ctx.getImageData(0, 0, 10, 10);
 ok(typeof(imgdata.width) == 'number', "typeof(imgdata.width) == 'number'");
 ok(typeof(imgdata.height) == 'number', "typeof(imgdata.height) == 'number'");
 ok(typeof(imgdata.data) == 'object', "typeof(imgdata.data) == 'object'");
-ok(imgdata.data.length === imgdata.width*imgdata.height*4, "imgdata.data.length === imgdata.width*imgdata.height*4");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.object.readonly.html b/content/canvas/test/test_2d.imageData.object.readonly.html
new file mode 100644
index 000000000000..4f2ba24cc24c
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.object.readonly.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.object.readonly</title>
+<!-- Testing: ImageData objects properties are read-only -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+var w = imgdata.width;
+var h = imgdata.height;
+var d = imgdata.data;
+imgdata.width = 123;
+imgdata.height = 123;
+imgdata.data = [100,100,100,100];
+todo(imgdata.width === w, "imgdata.width === w");
+todo(imgdata.height === h, "imgdata.height === h");
+todo(imgdata.data === d, "imgdata.data === d");
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+todo(imgdata.data[1] === 0, "imgdata.data[\""+(1)+"\"] === 0");
+todo(imgdata.data[2] === 0, "imgdata.data[\""+(2)+"\"] === 0");
+todo(imgdata.data[3] === 0, "imgdata.data[\""+(3)+"\"] === 0");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.object.round.html b/content/canvas/test/test_2d.imageData.object.round.html
new file mode 100644
index 000000000000..abcf0e60d586
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.object.round.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.object.round</title>
+<!-- Testing: ImageData.data rounds numbers with convertToIntegerTiesToEven -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+imgdata.data[0] = 0.499;
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+imgdata.data[0] = 0.5;
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+imgdata.data[0] = 0.501;
+todo(imgdata.data[0] === 1, "imgdata.data[\""+(0)+"\"] === 1");
+imgdata.data[0] = 1.499;
+todo(imgdata.data[0] === 1, "imgdata.data[\""+(0)+"\"] === 1");
+imgdata.data[0] = 1.5;
+todo(imgdata.data[0] === 2, "imgdata.data[\""+(0)+"\"] === 2");
+imgdata.data[0] = 1.501;
+todo(imgdata.data[0] === 2, "imgdata.data[\""+(0)+"\"] === 2");
+imgdata.data[0] = 2.5;
+todo(imgdata.data[0] === 2, "imgdata.data[\""+(0)+"\"] === 2");
+imgdata.data[0] = 3.5;
+todo(imgdata.data[0] === 4, "imgdata.data[\""+(0)+"\"] === 4");
+imgdata.data[0] = 252.5;
+todo(imgdata.data[0] === 252, "imgdata.data[\""+(0)+"\"] === 252");
+imgdata.data[0] = 253.5;
+todo(imgdata.data[0] === 254, "imgdata.data[\""+(0)+"\"] === 254");
+imgdata.data[0] = 254.5;
+todo(imgdata.data[0] === 254, "imgdata.data[\""+(0)+"\"] === 254");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.object.set.html b/content/canvas/test/test_2d.imageData.object.set.html
new file mode 100644
index 000000000000..b9ed1169c512
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.object.set.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.object.set</title>
+<!-- Testing: ImageData.data can be modified -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+imgdata.data[0] = 100;
+ok(imgdata.data[0] === 100, "imgdata.data[\""+(0)+"\"] === 100");
+imgdata.data[0] = 200;
+ok(imgdata.data[0] === 200, "imgdata.data[\""+(0)+"\"] === 200");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.object.string.html b/content/canvas/test/test_2d.imageData.object.string.html
new file mode 100644
index 000000000000..63c4b2cd8749
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.object.string.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.object.string</title>
+<!-- Testing: ImageData.data converts strings to numbers with ToNumber -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+imgdata.data[0] = 100;
+imgdata.data[0] = "110";
+todo(imgdata.data[0] === 110, "imgdata.data[\""+(0)+"\"] === 110");
+imgdata.data[0] = 100;
+imgdata.data[0] = "0x78";
+todo(imgdata.data[0] === 120, "imgdata.data[\""+(0)+"\"] === 120");
+imgdata.data[0] = 100;
+imgdata.data[0] = " +130e0 ";
+todo(imgdata.data[0] === 130, "imgdata.data[\""+(0)+"\"] === 130");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.fillStyle.parse.flavor.html b/content/canvas/test/test_2d.imageData.object.undefined.html
similarity index 52%
rename from content/canvas/test/test_2d.fillStyle.parse.flavor.html
rename to content/canvas/test/test_2d.imageData.object.undefined.html
index 20ea7d6a2275..5da216787d3a 100644
--- a/content/canvas/test/test_2d.fillStyle.parse.flavor.html
+++ b/content/canvas/test/test_2d.imageData.object.undefined.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.flavor</title>
+<title>Canvas test: 2d.imageData.object.undefined</title>
+<!-- Testing: ImageData.data converts undefined to 0 -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,12 +14,13 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+imgdata.data[0] = 100;
+imgdata.data[0] = undefined;
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
 
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'flavor';
-ok(ctx.fillStyle =~ /^#(?!(FF0000|ff0000|f00)$)/, "ctx.fillStyle =~ /^#(?!(FF0000|ff0000|f00)$)/"); // test that it's not red
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.put.alpha.html b/content/canvas/test/test_2d.imageData.put.alpha.html
index 22600cbfaf29..3b061c6015c4 100644
--- a/content/canvas/test/test_2d.imageData.put.alpha.html
+++ b/content/canvas/test/test_2d.imageData.put.alpha.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.imageData.put.alpha</title>
+<!-- Testing: putImageData() puts non-solid image data correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +34,8 @@ ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0);
 isPixel(ctx, 50,25, 0,255,0,64, "50,25", "0,255,0,64", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.put.basic.html b/content/canvas/test/test_2d.imageData.put.basic.html
index 0350f22749d9..fe3bb7496b6b 100644
--- a/content/canvas/test/test_2d.imageData.put.basic.html
+++ b/content/canvas/test/test_2d.imageData.put.basic.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.imageData.put.basic</title>
+<!-- Testing: putImageData() puts image data from getImageData() onto the canvas -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +34,8 @@ ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.put.clip.html b/content/canvas/test/test_2d.imageData.put.clip.html
new file mode 100644
index 000000000000..7e11c7ba4abf
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.put.clip.html
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.clip - bug 433397</title>
+<!-- Testing: putImageData() is not affected by clipping regions -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.beginPath();
+ctx.rect(0, 0, 50, 50);
+ctx.clip();
+ctx.putImageData(imgdata, 0, 0);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
+todo_isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.put.created.html b/content/canvas/test/test_2d.imageData.put.created.html
new file mode 100644
index 000000000000..a359d5b4d9ee
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.put.created.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.created - bug 433004</title>
+<!-- Testing: putImageData() puts image data from createImageData() onto the canvas -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var imgdata = ctx.createImageData(100, 50);
+for (var i = 0; i < imgdata.data.length; i += 4) {
+    imgdata.data[i] = 0;
+    imgdata.data[i+1] = 255;
+    imgdata.data[i+2] = 0;
+    imgdata.data[i+3] = 255;
+}
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.putImageData(imgdata, 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.put.type.correct.html b/content/canvas/test/test_2d.imageData.put.cross.html
similarity index 58%
rename from content/canvas/test/test_2d.imageData.put.type.correct.html
rename to content/canvas/test/test_2d.imageData.put.cross.html
index 7b254c16a3fc..66df05391069 100644
--- a/content/canvas/test/test_2d.imageData.put.type.correct.html
+++ b/content/canvas/test/test_2d.imageData.put.cross.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.type.correct</title>
+<title>Canvas test: 2d.imageData.put.cross</title>
+<!-- Testing: putImageData() accepts image data got from a different canvas -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,19 +26,18 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50)
-var imgdata1 = ctx.getImageData(45, 20, 10, 10);
+var canvas2 = document.createElement('canvas');
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#0f0';
+ctx2.fillRect(0, 0, 100, 50)
+var imgdata = ctx2.getImageData(0, 0, 100, 50);
 ctx.fillStyle = '#f00';
-ctx.fillRect(45, 20, 10, 10)
-var data = [];
-for (var i = 0; i < imgdata1.data.length; ++i)
-    data[i] = imgdata1.data[i];
-var imgdata2 = { width: imgdata1.width, height: imgdata1.height, data: data };
-ctx.putImageData(imgdata2, 45, 20);
+ctx.fillRect(0, 0, 100, 50)
+ctx.putImageData(imgdata, 0, 0);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.put.dirty.negative.html b/content/canvas/test/test_2d.imageData.put.dirty.negative.html
new file mode 100644
index 000000000000..5a660f57e908
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.put.dirty.negative.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.dirty.negative</title>
+<!-- Testing: putImageData() handles negative-sized dirty rectangles correctly -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 20, 20)
+
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+ctx.fillStyle = '#f00';
+ctx.fillRect(40, 20, 20, 20)
+ctx.putImageData(imgdata, 40, 20, 20, 20, -20, -20);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+isPixel(ctx, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2);
+isPixel(ctx, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2);
+isPixel(ctx, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2);
+isPixel(ctx, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.put.dirty.outside.html b/content/canvas/test/test_2d.imageData.put.dirty.outside.html
new file mode 100644
index 000000000000..c5a81f3a8d70
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.put.dirty.outside.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.dirty.outside</title>
+<!-- Testing: putImageData() handles dirty rectangles outside the canvas correctly -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+
+ctx.putImageData(imgdata, 100, 20, 20, 20, -20, -20);
+ctx.putImageData(imgdata, 200, 200, 0, 0, 100, 50);
+ctx.putImageData(imgdata, 40, 20, -30, -20, 30, 20);
+ctx.putImageData(imgdata, -30, 20, 0, 0, 30, 20);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+isPixel(ctx, 98,15, 0,255,0,255, "98,15", "0,255,0,255", 2);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 2);
+isPixel(ctx, 98,45, 0,255,0,255, "98,45", "0,255,0,255", 2);
+isPixel(ctx, 1,5, 0,255,0,255, "1,5", "0,255,0,255", 2);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 2);
+isPixel(ctx, 1,45, 0,255,0,255, "1,45", "0,255,0,255", 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.put.dirty.rect1.html b/content/canvas/test/test_2d.imageData.put.dirty.rect1.html
new file mode 100644
index 000000000000..47ad1547df2e
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.put.dirty.rect1.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.dirty.rect1</title>
+<!-- Testing: putImageData() only modifies areas inside the dirty rectangle, using width and height -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 20, 20)
+
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+ctx.fillStyle = '#f00';
+ctx.fillRect(40, 20, 20, 20)
+ctx.putImageData(imgdata, 40, 20, 0, 0, 20, 20);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+isPixel(ctx, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2);
+isPixel(ctx, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2);
+isPixel(ctx, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2);
+isPixel(ctx, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.put.dirty.rect2.html b/content/canvas/test/test_2d.imageData.put.dirty.rect2.html
new file mode 100644
index 000000000000..0db2630c7e00
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.put.dirty.rect2.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.dirty.rect2</title>
+<!-- Testing: putImageData() only modifies areas inside the dirty rectangle, using x and y -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.fillStyle = '#0f0';
+ctx.fillRect(60, 30, 20, 20)
+
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+ctx.fillStyle = '#f00';
+ctx.fillRect(40, 20, 20, 20)
+ctx.putImageData(imgdata, -20, -10, 60, 30, 20, 20);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+isPixel(ctx, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2);
+isPixel(ctx, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2);
+isPixel(ctx, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2);
+isPixel(ctx, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.put.dirty.zero.html b/content/canvas/test/test_2d.imageData.put.dirty.zero.html
new file mode 100644
index 000000000000..14548d6d06f2
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.put.dirty.zero.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.dirty.zero</title>
+<!-- Testing: putImageData() with zero-sized dirty rectangle puts nothing -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+ctx.putImageData(imgdata, 0, 0, 0, 0, 0, 0);
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.put.modified.html b/content/canvas/test/test_2d.imageData.put.modified.html
index 5a2c2f70705c..eaa0c9f29820 100644
--- a/content/canvas/test/test_2d.imageData.put.modified.html
+++ b/content/canvas/test/test_2d.imageData.put.modified.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.imageData.put.modified</title>
+<!-- Testing: putImageData() puts modified image data correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -39,7 +39,8 @@ for (var i = 0, len = imgdata.width*imgdata.height*4; i < len; i += 4)
 ctx.putImageData(imgdata, 45, 20);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.put.nonfinite.html b/content/canvas/test/test_2d.imageData.put.nonfinite.html
new file mode 100644
index 000000000000..c54d38f5800e
--- /dev/null
+++ b/content/canvas/test/test_2d.imageData.put.nonfinite.html
@@ -0,0 +1,269 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.nonfinite</title>
+<!-- Testing: putImageData() throws NOT_SUPPORTED_ERR if arguments are not finite -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, -Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, NaN, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, -Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, NaN);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, -Infinity, 10, 10, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, NaN, 10, 10, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, -Infinity, 10, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, NaN, 10, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, -Infinity, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, NaN, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, -Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, NaN, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, 10, -Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, 10, NaN, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, 10, 10, -Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, 10, 10, NaN);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.transformation.rotate.neginfinity.html b/content/canvas/test/test_2d.imageData.put.null.html
similarity index 61%
rename from content/canvas/test/test_2d.transformation.rotate.neginfinity.html
rename to content/canvas/test/test_2d.imageData.put.null.html
index 894bc2cac282..065df796754c 100644
--- a/content/canvas/test/test_2d.transformation.rotate.neginfinity.html
+++ b/content/canvas/test/test_2d.imageData.put.null.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.rotate.neginfinity</title>
+<title>Canvas test: 2d.imageData.put.null - bug 421715</title>
+<!-- Testing: putImageData() with null imagedata throws TYPE_MISMATCH_ERR -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -15,10 +15,11 @@ var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
 var _thrown = undefined; try {
-  ctx.rotate(-Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+  ctx.putImageData(null, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.put.path.html b/content/canvas/test/test_2d.imageData.put.path.html
index 3f5e432fdf0d..6c391090ce12 100644
--- a/content/canvas/test/test_2d.imageData.put.path.html
+++ b/content/canvas/test/test_2d.imageData.put.path.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.imageData.put.path</title>
+<!-- Testing: putImageData() does not affect the current path -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +35,8 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.put.type.invalidsize.html b/content/canvas/test/test_2d.imageData.put.type.invalidsize.html
deleted file mode 100644
index dcf88e3405df..000000000000
--- a/content/canvas/test/test_2d.imageData.put.type.invalidsize.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.type.invalidsize</title>
-<script src="/MochiKit/MochiKit.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-var _deferred = false;
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var imgdata1 = ctx.getImageData(0, 0, 10, 10);
-var _thrown = undefined; try {
-  ctx.putImageData({ width: 0, height: imgdata1.height, data: imgdata1.data }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: -1, height: imgdata1.height, data: imgdata1.data }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: NaN, height: imgdata1.height, data: imgdata1.data }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: imgdata1.width, height: 0, data: imgdata1.data }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: imgdata1.width, height: -1, data: imgdata1.data }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: imgdata1.width, height: NaN, data: imgdata1.data }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: 1, height: 1, data: [] }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: 1, height: 1, data: [0] }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: 1, height: 1, data: [0,0] }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: 1, height: 1, data: [0,0,0] }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: 1, height: 1, data: [0,0,0,0,0] }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-
-if (!_deferred) SimpleTest.finish();
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.type.invalidvalues.html b/content/canvas/test/test_2d.imageData.put.type.invalidvalues.html
deleted file mode 100644
index a051615b0009..000000000000
--- a/content/canvas/test/test_2d.imageData.put.type.invalidvalues.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.type.invalidvalues</title>
-<script src="/MochiKit/MochiKit.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-var _deferred = false;
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.putImageData({ width: 1, height: 1, data: [-1, 0, 0, 0] }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: 1, height: 1, data: [0, 0, 0, -1] }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: 1, height: 1, data: [256, 0, 0, 0] }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: 1, height: 1, data: [0, 0, 0, 256] }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: 1, height: 1, data: [NaN, 0, 0, 0] }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData({ width: 1, height: 1, data: [0, 0, 0, NaN] }, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-
-if (!_deferred) SimpleTest.finish();
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.unaffected.html b/content/canvas/test/test_2d.imageData.put.unaffected.html
index 31dd9fb38e58..ba0adc6c1a6b 100644
--- a/content/canvas/test/test_2d.imageData.put.unaffected.html
+++ b/content/canvas/test/test_2d.imageData.put.unaffected.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.imageData.put.unaffected</title>
+<!-- Testing: putImageData() is not affected by context state -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -39,7 +39,8 @@ ctx.scale(0.1, 0.1);
 ctx.putImageData(imgdata, 0, 0);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.put.unchanged.html b/content/canvas/test/test_2d.imageData.put.unchanged.html
index 8a87ffc5e348..8e4e827d18b7 100644
--- a/content/canvas/test/test_2d.imageData.put.unchanged.html
+++ b/content/canvas/test/test_2d.imageData.put.unchanged.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.imageData.put.unchanged</title>
+<!-- Testing: putImageData(getImageData(...), ...) has no effect -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -15,10 +15,8 @@ var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
 var i = 0;
-for (var y = 0; y < 16; ++y)
-{
-    for (var x = 0; x < 16; ++x, ++i)
-    {
+for (var y = 0; y < 16; ++y) {
+    for (var x = 0; x < 16; ++x, ++i) {
         ctx.fillStyle = 'rgba(' + i + ',' + (Math.floor(i*1.5) % 256) + ',' + (Math.floor(i*23.3) % 256) + ',' + (i/256) + ')';
         ctx.fillRect(x, y, 1, 1);
     }
@@ -27,15 +25,16 @@ var imgdata1 = ctx.getImageData(0.1, 0.2, 15.8, 15.9);
 var olddata = [];
 for (var i = 0; i < imgdata1.data.length; ++i)
     olddata[i] = imgdata1.data[i];
+
 ctx.putImageData(imgdata1, 0.1, 0.2);
 
 var imgdata2 = ctx.getImageData(0.1, 0.2, 15.8, 15.9);
-for (var i = 0; i < imgdata2.data.length; ++i)
-{
+for (var i = 0; i < imgdata2.data.length; ++i) {
     ok(olddata[i] === imgdata2.data[i], "olddata[\""+(i)+"\"] === imgdata2.data[\""+(i)+"\"]");
 }
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.imageData.put.type.missing.html b/content/canvas/test/test_2d.imageData.put.wrongtype.html
similarity index 65%
rename from content/canvas/test/test_2d.imageData.put.type.missing.html
rename to content/canvas/test/test_2d.imageData.put.wrongtype.html
index b00c2ec934cc..61b71295bf3d 100644
--- a/content/canvas/test/test_2d.imageData.put.type.missing.html
+++ b/content/canvas/test/test_2d.imageData.put.wrongtype.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.type.missing</title>
+<title>Canvas test: 2d.imageData.put.wrongtype</title>
+<!-- Testing: putImageData() does not accept non-ImageData objects -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,18 +14,19 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-var imgdata1 = ctx.getImageData(0, 0, 10, 10);
+var imgdata = { width: 1, height: 1, data: [255, 0, 0, 255] };
 var _thrown = undefined; try {
-  ctx.putImageData({ height: imgdata1.height, data: imgdata1.data }, 0, 0);
+  ctx.putImageData(imgdata, 0, 0);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
 var _thrown = undefined; try {
-  ctx.putImageData({ width: imgdata1.width, data: imgdata1.data }, 0, 0);
+  ctx.putImageData("cheese", 0, 0);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
 var _thrown = undefined; try {
-  ctx.putImageData({ width: imgdata1.width, height: imgdata1.height }, 0, 0);
+  ctx.putImageData(42, 0, 0);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.lineCap.butt.html b/content/canvas/test/test_2d.line.cap.butt.html
similarity index 87%
rename from content/canvas/test/test_2d.line.lineCap.butt.html
rename to content/canvas/test/test_2d.line.cap.butt.html
index 38c4770a7f23..28be0448844f 100644
--- a/content/canvas/test/test_2d.line.lineCap.butt.html
+++ b/content/canvas/test/test_2d.line.cap.butt.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.lineCap.butt</title>
+<title>Canvas test: 2d.line.cap.butt</title>
+<!-- Testing: lineCap 'butt' is rendered correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -62,7 +62,8 @@ isPixel(ctx, 75,34, 0,255,0,255, "75,34", "0,255,0,255", 0);
 isPixel(ctx, 75,35, 0,255,0,255, "75,35", "0,255,0,255", 0);
 isPixel(ctx, 75,36, 0,255,0,255, "75,36", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.cap.closed.html b/content/canvas/test/test_2d.line.cap.closed.html
index 75402ce0b374..d1cb21600651 100644
--- a/content/canvas/test/test_2d.line.cap.closed.html
+++ b/content/canvas/test/test_2d.line.cap.closed.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.line.cap.closed</title>
+<!-- Testing: Line caps are not drawn at the corners of an unclosed rectangle -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -47,7 +47,8 @@ isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
 isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.cap.invalid.html b/content/canvas/test/test_2d.line.cap.invalid.html
new file mode 100644
index 000000000000..f90cbd35d923
--- /dev/null
+++ b/content/canvas/test/test_2d.line.cap.invalid.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.cap.invalid - bug 401788</title>
+<!-- Testing: Setting lineCap to invalid values is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.lineCap = 'butt'
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+
+ctx.lineCap = 'butt';
+ctx.lineCap = 'invalid';
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+
+ctx.lineCap = 'butt';
+ctx.lineCap = 'ROUND';
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+
+ctx.lineCap = 'butt';
+ctx.lineCap = 'round\0';
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+
+ctx.lineCap = 'butt';
+ctx.lineCap = 'round ';
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+
+ctx.lineCap = 'butt';
+ctx.lineCap = "";
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+
+ctx.lineCap = 'butt';
+ctx.lineCap = 'bevel';
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.line.cap.open.html b/content/canvas/test/test_2d.line.cap.open.html
index 2853fd0b7663..3e933a2e741a 100644
--- a/content/canvas/test/test_2d.line.cap.open.html
+++ b/content/canvas/test/test_2d.line.cap.open.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.line.cap.open</title>
+<!-- Testing: Line caps are drawn at the corners of an unclosed rectangle -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -47,7 +47,8 @@ isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
 isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.lineCap.round.html b/content/canvas/test/test_2d.line.cap.round.html
similarity index 88%
rename from content/canvas/test/test_2d.line.lineCap.round.html
rename to content/canvas/test/test_2d.line.cap.round.html
index 9ee85607d098..33ae23227e33 100644
--- a/content/canvas/test/test_2d.line.lineCap.round.html
+++ b/content/canvas/test/test_2d.line.cap.round.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.lineCap.round</title>
+<title>Canvas test: 2d.line.cap.round</title>
+<!-- Testing: lineCap 'round' is rendered correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -78,7 +78,8 @@ isPixel(ctx, 67,43, 0,255,0,255, "67,43", "0,255,0,255", 0);
 isPixel(ctx, 75,43, 0,255,0,255, "75,43", "0,255,0,255", 0);
 isPixel(ctx, 82,43, 0,255,0,255, "82,43", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.lineCap.square.html b/content/canvas/test/test_2d.line.cap.square.html
similarity index 86%
rename from content/canvas/test/test_2d.line.lineCap.square.html
rename to content/canvas/test/test_2d.line.cap.square.html
index 5e006a2eb123..2ee148bd010e 100644
--- a/content/canvas/test/test_2d.line.lineCap.square.html
+++ b/content/canvas/test/test_2d.line.cap.square.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.lineCap.square</title>
+<title>Canvas test: 2d.line.cap.square</title>
+<!-- Testing: lineCap 'square' is rendered correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -62,7 +62,8 @@ isPixel(ctx, 75,44, 0,255,0,255, "75,44", "0,255,0,255", 0);
 isPixel(ctx, 75,45, 0,255,0,255, "75,45", "0,255,0,255", 0);
 isPixel(ctx, 75,46, 0,255,0,255, "75,46", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.cross.html b/content/canvas/test/test_2d.line.cross.html
index d40cb7f10f1d..5034a5ec63b1 100644
--- a/content/canvas/test/test_2d.line.cross.html
+++ b/content/canvas/test/test_2d.line.cross.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.line.cross</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -44,7 +43,8 @@ isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
 isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.defaults.html b/content/canvas/test/test_2d.line.defaults.html
index eb05a8b94f2c..6faba4a3f1cb 100644
--- a/content/canvas/test/test_2d.line.defaults.html
+++ b/content/canvas/test/test_2d.line.defaults.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.line.defaults</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -19,7 +18,8 @@ ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
 ok(ctx.lineJoin === 'miter', "ctx.lineJoin === 'miter'");
 ok(ctx.miterLimit === 10, "ctx.miterLimit === 10");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.lineJoin.bevel.html b/content/canvas/test/test_2d.line.join.bevel.html
similarity index 88%
rename from content/canvas/test/test_2d.line.lineJoin.bevel.html
rename to content/canvas/test/test_2d.line.join.bevel.html
index 897efa42d9f5..5930e000d0fe 100644
--- a/content/canvas/test/test_2d.line.lineJoin.bevel.html
+++ b/content/canvas/test/test_2d.line.join.bevel.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.lineJoin.bevel</title>
+<title>Canvas test: 2d.line.join.bevel</title>
+<!-- Testing: lineJoin 'bevel' is rendered correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -81,7 +81,8 @@ isPixel(ctx, 85,15, 0,255,0,255, "85,15", "0,255,0,255", 0);
 isPixel(ctx, 86,15, 0,255,0,255, "86,15", "0,255,0,255", 0);
 isPixel(ctx, 86,14, 0,255,0,255, "86,14", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.join.closed.html b/content/canvas/test/test_2d.line.join.closed.html
index d65423c1be70..92639a6cde97 100644
--- a/content/canvas/test/test_2d.line.join.closed.html
+++ b/content/canvas/test/test_2d.line.join.closed.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.line.join.closed</title>
+<!-- Testing: Line joins are drawn at the corner of a closed rectangle -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -46,7 +46,8 @@ isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
 isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.join.invalid.html b/content/canvas/test/test_2d.line.join.invalid.html
new file mode 100644
index 000000000000..05b0839189b4
--- /dev/null
+++ b/content/canvas/test/test_2d.line.join.invalid.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.join.invalid - bug 401788</title>
+<!-- Testing: Setting lineJoin to invalid values is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.lineJoin = 'bevel'
+ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
+
+ctx.lineJoin = 'bevel';
+ctx.lineJoin = 'invalid';
+ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
+
+ctx.lineJoin = 'bevel';
+ctx.lineJoin = 'ROUND';
+ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
+
+ctx.lineJoin = 'bevel';
+ctx.lineJoin = 'round\0';
+ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
+
+ctx.lineJoin = 'bevel';
+ctx.lineJoin = 'round ';
+ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
+
+ctx.lineJoin = 'bevel';
+ctx.lineJoin = "";
+ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
+
+ctx.lineJoin = 'bevel';
+ctx.lineJoin = 'butt';
+ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.line.lineJoin.miter.html b/content/canvas/test/test_2d.line.join.miter.html
similarity index 87%
rename from content/canvas/test/test_2d.line.lineJoin.miter.html
rename to content/canvas/test/test_2d.line.join.miter.html
index 0eab8452acd2..1a32b15d320a 100644
--- a/content/canvas/test/test_2d.line.lineJoin.miter.html
+++ b/content/canvas/test/test_2d.line.join.miter.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.lineJoin.miter</title>
+<title>Canvas test: 2d.line.join.miter</title>
+<!-- Testing: lineJoin 'miter' is rendered correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -72,7 +72,8 @@ isPixel(ctx, 90,10, 0,255,0,255, "90,10", "0,255,0,255", 0);
 isPixel(ctx, 91,9, 0,255,0,255, "91,9", "0,255,0,255", 0);
 isPixel(ctx, 92,8, 0,255,0,255, "92,8", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.join.open.html b/content/canvas/test/test_2d.line.join.open.html
index cbf157f95935..366d0dc6c10f 100644
--- a/content/canvas/test/test_2d.line.join.open.html
+++ b/content/canvas/test/test_2d.line.join.open.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.line.join.open</title>
+<!-- Testing: Line joins are not drawn at the corner of an unclosed rectangle -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -46,7 +46,8 @@ isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
 isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.join.parallel.html b/content/canvas/test/test_2d.line.join.parallel.html
index 95e1321f4320..4512dde71835 100644
--- a/content/canvas/test/test_2d.line.join.parallel.html
+++ b/content/canvas/test/test_2d.line.join.parallel.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.line.join.parallel</title>
+<!-- Testing: Line joins are drawn at 180-degree joins -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -43,7 +43,8 @@ isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
 isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.lineJoin.round.html b/content/canvas/test/test_2d.line.join.round.html
similarity index 88%
rename from content/canvas/test/test_2d.line.lineJoin.round.html
rename to content/canvas/test/test_2d.line.join.round.html
index 9f46dccf42da..fcdbbb656202 100644
--- a/content/canvas/test/test_2d.line.lineJoin.round.html
+++ b/content/canvas/test/test_2d.line.join.round.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.lineJoin.round</title>
+<title>Canvas test: 2d.line.join.round</title>
+<!-- Testing: lineJoin 'round' is rendered correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -79,7 +79,8 @@ isPixel(ctx, 87,13, 0,255,0,255, "87,13", "0,255,0,255", 0);
 isPixel(ctx, 88,13, 0,255,0,255, "88,13", "0,255,0,255", 0);
 isPixel(ctx, 88,12, 0,255,0,255, "88,12", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.join.zeroline.corner.html b/content/canvas/test/test_2d.line.miter.acute.html
similarity index 68%
rename from content/canvas/test/test_2d.line.join.zeroline.corner.html
rename to content/canvas/test/test_2d.line.miter.acute.html
index 830ed110bbc1..aa0c56c1c474 100644
--- a/content/canvas/test/test_2d.line.join.zeroline.corner.html
+++ b/content/canvas/test/test_2d.line.miter.acute.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.join.zeroline.corner</title>
+<title>Canvas test: 2d.line.miter.acute</title>
+<!-- Testing: Miter joins are drawn correctly with acute angles -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -27,19 +27,25 @@ var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
 ctx.fillStyle = '#f00';
-ctx.strokeStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
-ctx.lineJoin = 'miter';
 ctx.lineWidth = 200;
+ctx.lineJoin = 'miter';
 
+ctx.strokeStyle = '#0f0';
+ctx.miterLimit = 2.614;
 ctx.beginPath();
-ctx.moveTo(1000, 50);
-ctx.lineTo(100, 50);
-ctx.lineTo(100, 50);
-ctx.lineTo(100, 50);
-ctx.lineTo(100, 1000);
-ctx.closePath();
+ctx.moveTo(100, 1000);
+ctx.lineTo(100, 100);
+ctx.lineTo(1000, 1000);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.miterLimit = 2.613;
+ctx.beginPath();
+ctx.moveTo(100, 1000);
+ctx.lineTo(100, 100);
+ctx.lineTo(1000, 1000);
 ctx.stroke();
 
 isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
@@ -47,7 +53,8 @@ isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
 isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.miter.exceeded.html b/content/canvas/test/test_2d.line.miter.exceeded.html
index 35c2c708a1dc..5be8445fad82 100644
--- a/content/canvas/test/test_2d.line.miter.exceeded.html
+++ b/content/canvas/test/test_2d.line.miter.exceeded.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.line.miter.exceeded</title>
+<!-- Testing: Miter joins are not drawn when the miter limit is exceeded -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -37,7 +37,7 @@ ctx.miterLimit = 1.414;
 ctx.beginPath();
 ctx.moveTo(200, 1000);
 ctx.lineTo(200, 200);
-ctx.lineTo(1000, 201);
+ctx.lineTo(1000, 201); // slightly non-right-angle to avoid being a special case
 ctx.stroke();
 
 isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
@@ -45,7 +45,8 @@ isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
 isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.miter.invalid.html b/content/canvas/test/test_2d.line.miter.invalid.html
new file mode 100644
index 000000000000..786371397c0a
--- /dev/null
+++ b/content/canvas/test/test_2d.line.miter.invalid.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.miter.invalid</title>
+<!-- Testing: Setting miterLimit to invalid values is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.miterLimit = 1.5;
+ok(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
+
+ctx.miterLimit = 1.5;
+ctx.miterLimit = 0;
+todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
+
+ctx.miterLimit = 1.5;
+ctx.miterLimit = -1;
+todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
+
+ctx.miterLimit = 1.5;
+ctx.miterLimit = Infinity;
+todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
+
+ctx.miterLimit = 1.5;
+ctx.miterLimit = -Infinity;
+todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
+
+ctx.miterLimit = 1.5;
+ctx.miterLimit = NaN;
+todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.line.miter.lineedge.html b/content/canvas/test/test_2d.line.miter.lineedge.html
index 6197ded74b68..20d840f65f40 100644
--- a/content/canvas/test/test_2d.line.miter.lineedge.html
+++ b/content/canvas/test/test_2d.line.miter.lineedge.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.miter.lineedge</title>
+<title>Canvas test: 2d.line.miter.lineedge - bug 401791</title>
+<!-- Testing: Miter joins are not drawn when the miter limit is exceeded at the corners of a zero-height rectangle -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,8 +26,6 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-// In Safari/FF3, this works if you do something like ctx.rotate(0.001);
-
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -44,7 +42,8 @@ isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
 isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.cap.zerobezier.round.html b/content/canvas/test/test_2d.line.miter.obtuse.html
similarity index 63%
rename from content/canvas/test/test_2d.line.cap.zerobezier.round.html
rename to content/canvas/test/test_2d.line.miter.obtuse.html
index 8b69da528b2d..eac7e156e32f 100644
--- a/content/canvas/test/test_2d.line.cap.zerobezier.round.html
+++ b/content/canvas/test/test_2d.line.miter.obtuse.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.cap.zerobezier.round</title>
+<title>Canvas test: 2d.line.miter.obtuse</title>
+<!-- Testing: Miter joins are drawn correctly with obtuse angles -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,16 +26,28 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-ctx.fillStyle = '#0f0';
+ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 150;
-ctx.lineCap = 'round';
+var x=800;
+var y=300;
+ctx.lineWidth = 1600;
+ctx.lineJoin = 'miter';
 
+ctx.strokeStyle = '#0f0';
+ctx.miterLimit = 1.083;
 ctx.beginPath();
-ctx.moveTo(50, 25);
-ctx.bezierCurveTo(50, 25, 50, 25, 50, 25);
+ctx.moveTo(800, 10000);
+ctx.lineTo(800, 300);
+ctx.lineTo(10000, -8900);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.miterLimit = 1.082;
+ctx.beginPath();
+ctx.moveTo(800, 10000);
+ctx.lineTo(800, 300);
+ctx.lineTo(10000, -8900);
 ctx.stroke();
 
 isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
@@ -43,7 +55,8 @@ isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
 isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.miter.rightangle.html b/content/canvas/test/test_2d.line.miter.rightangle.html
index e3e3c5a4a710..b211528e611c 100644
--- a/content/canvas/test/test_2d.line.miter.rightangle.html
+++ b/content/canvas/test/test_2d.line.miter.rightangle.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.miter.rightangle</title>
+<title>Canvas test: 2d.line.miter.rightangle - bug 401791</title>
+<!-- Testing: Miter joins are not drawn when the miter limit is exceeded, on exact right angles -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,8 +26,6 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-// In FF3, this works if you do something like ctx.rotate(0.001);
-
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -47,7 +45,8 @@ isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
 isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.miter.within.html b/content/canvas/test/test_2d.line.miter.within.html
index 691f09d51a59..ec41fa0d5e92 100644
--- a/content/canvas/test/test_2d.line.miter.within.html
+++ b/content/canvas/test/test_2d.line.miter.within.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.line.miter.within</title>
+<!-- Testing: Miter joins are drawn when the miter limit is not quite exceeded -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -45,7 +45,8 @@ isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
 isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.union.html b/content/canvas/test/test_2d.line.union.html
index 976765be1f31..eb1ab6b07219 100644
--- a/content/canvas/test/test_2d.line.union.html
+++ b/content/canvas/test/test_2d.line.union.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.line.union</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -47,7 +46,8 @@ isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 25,1, 0,255,0,255, "25,1", "0,255,0,255", 0);
 isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.lineWidth.basic.html b/content/canvas/test/test_2d.line.width.basic.html
similarity index 88%
rename from content/canvas/test/test_2d.line.lineWidth.basic.html
rename to content/canvas/test/test_2d.line.width.basic.html
index 937855e0505c..c12ec8d8e700 100644
--- a/content/canvas/test/test_2d.line.lineWidth.basic.html
+++ b/content/canvas/test/test_2d.line.width.basic.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.lineWidth.basic</title>
+<title>Canvas test: 2d.line.width.basic</title>
+<!-- Testing: lineWidth determines the width of line strokes -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -64,7 +64,8 @@ isPixel(ctx, 84,25, 0,255,0,255, "84,25", "0,255,0,255", 0);
 isPixel(ctx, 85,25, 0,255,0,255, "85,25", "0,255,0,255", 0);
 isPixel(ctx, 86,25, 0,255,0,255, "86,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.width.invalid.html b/content/canvas/test/test_2d.line.width.invalid.html
new file mode 100644
index 000000000000..3df2053bd7fb
--- /dev/null
+++ b/content/canvas/test/test_2d.line.width.invalid.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.width.invalid</title>
+<!-- Testing: Setting lineWidth to invalid values is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.lineWidth = 1.5;
+ok(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
+
+ctx.lineWidth = 1.5;
+ctx.lineWidth = 0;
+todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
+
+ctx.lineWidth = 1.5;
+ctx.lineWidth = -1;
+todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
+
+ctx.lineWidth = 1.5;
+ctx.lineWidth = Infinity;
+todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
+
+ctx.lineWidth = 1.5;
+ctx.lineWidth = -Infinity;
+todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
+
+ctx.lineWidth = 1.5;
+ctx.lineWidth = NaN;
+todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.line.lineWidth.transformed.html b/content/canvas/test/test_2d.line.width.transformed.html
similarity index 88%
rename from content/canvas/test/test_2d.line.lineWidth.transformed.html
rename to content/canvas/test/test_2d.line.width.transformed.html
index 0429dbf15405..275cd64246cc 100644
--- a/content/canvas/test/test_2d.line.lineWidth.transformed.html
+++ b/content/canvas/test/test_2d.line.width.transformed.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.lineWidth.transformed</title>
+<title>Canvas test: 2d.line.width.transformed</title>
+<!-- Testing: Line stroke widths are affected by scale transformations -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -70,7 +70,8 @@ isPixel(ctx, 84,25, 0,255,0,255, "84,25", "0,255,0,255", 0);
 isPixel(ctx, 85,25, 0,255,0,255, "85,25", "0,255,0,255", 0);
 isPixel(ctx, 86,25, 0,255,0,255, "86,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.missingargs.html b/content/canvas/test/test_2d.missingargs.html
new file mode 100644
index 000000000000..aedb22dfcec4
--- /dev/null
+++ b/content/canvas/test/test_2d.missingargs.html
@@ -0,0 +1,294 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.missingargs</title>
+<!-- Testing: Missing arguments cause NOT_SUPPORTED_ERR -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.scale();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.scale(1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.rotate();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.translate();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.translate(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+if (ctx.transform) { // (avoid spurious failures, since the aim here is not to test that all features are supported)
+    var _thrown = undefined; try {
+  ctx.transform();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.transform(1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.transform(1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.transform(1, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.transform(1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.transform(1, 0, 0, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+}
+if (ctx.setTransform) {
+    var _thrown = undefined; try {
+  ctx.setTransform();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.setTransform(1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.setTransform(1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.setTransform(1, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.setTransform(1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.setTransform(1, 0, 0, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+}
+var _thrown = undefined; try {
+  ctx.createLinearGradient();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createPattern(canvas);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.clearRect();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.clearRect(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.clearRect(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.clearRect(0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.fillRect();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.fillRect(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.fillRect(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.fillRect(0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.strokeRect();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.strokeRect(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.strokeRect(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.strokeRect(0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.moveTo();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.moveTo(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.lineTo();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.lineTo(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.quadraticCurveTo();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.quadraticCurveTo(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.quadraticCurveTo(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.quadraticCurveTo(0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.bezierCurveTo();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.bezierCurveTo(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.bezierCurveTo(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.bezierCurveTo(0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.bezierCurveTo(0, 0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.bezierCurveTo(0, 0, 0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arcTo();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arcTo(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arcTo(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arcTo(0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arcTo(0, 0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.rect();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.rect(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.rect(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.rect(0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arc();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arc(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arc(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arc(0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arc(0, 0, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arc(0, 0, 1, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+if (ctx.isPointInPath) {
+    var _thrown = undefined; try {
+  ctx.isPointInPath();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.isPointInPath(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+}
+var _thrown = undefined; try {
+  ctx.drawImage();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(canvas);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(canvas, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+// TODO: n >= 3 args on drawImage could be either a valid overload,
+// or too few for another overload, or too many for another
+// overload - what should happen?
+if (ctx.createImageData) {
+    var _thrown = undefined; try {
+  ctx.createImageData();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.createImageData(1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+}
+if (ctx.getImageData) {
+    var _thrown = undefined; try {
+  ctx.getImageData();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.getImageData(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.getImageData(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.getImageData(0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+}
+if (ctx.putImageData) {
+    var imgdata = ctx.getImageData(0, 0, 1, 1);
+    var _thrown = undefined; try {
+  ctx.putImageData();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.putImageData(imgdata);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+}
+var g = ctx.createLinearGradient(0, 0, 0, 0);
+var _thrown = undefined; try {
+  g.addColorStop();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  g.addColorStop(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arc.angle.1.html b/content/canvas/test/test_2d.path.arc.angle.1.html
index 367b20faef7f..59bd19d673cb 100644
--- a/content/canvas/test/test_2d.path.arc.angle.1.html
+++ b/content/canvas/test/test_2d.path.arc.angle.1.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.angle.1</title>
+<!-- Testing: arc() draws pi/2 .. -pi anticlockwise correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,14 +26,17 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#f00';
 ctx.beginPath();
 ctx.moveTo(100, 0);
 ctx.arc(100, 0, 150, Math.PI/2, -Math.PI, true);
 ctx.fill();
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.angle.2.html b/content/canvas/test/test_2d.path.arc.angle.2.html
index 79af1eed498d..243f2f2ed96d 100644
--- a/content/canvas/test/test_2d.path.arc.angle.2.html
+++ b/content/canvas/test/test_2d.path.arc.angle.2.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.angle.2</title>
+<!-- Testing: arc() draws -3pi/2 .. -pi anticlockwise correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,14 +26,17 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#f00';
 ctx.beginPath();
 ctx.moveTo(100, 0);
 ctx.arc(100, 0, 150, -3*Math.PI/2, -Math.PI, true);
 ctx.fill();
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.angle.3.html b/content/canvas/test/test_2d.path.arc.angle.3.html
index 1d7573f3b225..6cd449b149c2 100644
--- a/content/canvas/test/test_2d.path.arc.angle.3.html
+++ b/content/canvas/test/test_2d.path.arc.angle.3.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.angle.3</title>
+<!-- Testing: arc() wraps angles mod 2pi when anticlockwise and end > start+2pi -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,14 +26,17 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#f00';
 ctx.beginPath();
 ctx.moveTo(100, 0);
 ctx.arc(100, 0, 150, (512+1/2)*Math.PI, (1024-1)*Math.PI, true);
 ctx.fill();
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.angle.4.html b/content/canvas/test/test_2d.path.arc.angle.4.html
index 5dd0f61a4334..31473fb6244f 100644
--- a/content/canvas/test/test_2d.path.arc.angle.4.html
+++ b/content/canvas/test/test_2d.path.arc.angle.4.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.angle.4</title>
+<!-- Testing: arc() draws a full circle when clockwise and end > start+2pi -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,14 +26,20 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#0f0';
 ctx.beginPath();
-ctx.moveTo(100, 0);
-ctx.arc(100, 0, 150, (512+1/2)*Math.PI, (1024-1)*Math.PI, false);
+ctx.moveTo(50, 25);
+ctx.arc(50, 25, 60, (512+1/2)*Math.PI, (1024-1)*Math.PI, false);
 ctx.fill();
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.transformation.multiple.1.html b/content/canvas/test/test_2d.path.arc.angle.5.html
similarity index 60%
rename from content/canvas/test/test_2d.path.transformation.multiple.1.html
rename to content/canvas/test/test_2d.path.arc.angle.5.html
index bf6b5aa6bde2..e7800c1a2732 100644
--- a/content/canvas/test/test_2d.path.transformation.multiple.1.html
+++ b/content/canvas/test/test_2d.path.arc.angle.5.html
@@ -1,27 +1,24 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.path.transformation.multiple.1</title>
+<title>Canvas test: 2d.path.arc.angle.5</title>
+<!-- Testing: arc() wraps angles mod 2pi when clockwise and start > end+2pi -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
-}
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -29,18 +26,17 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.rect(100, 0, 100, 50);
-ctx.fill();
-ctx.translate(-100, 0);
 ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(100, 0);
+ctx.arc(100, 0, 150, (1024-1)*Math.PI, (512+1/2)*Math.PI, false);
 ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.line.join.zeroline.join.html b/content/canvas/test/test_2d.path.arc.angle.6.html
similarity index 64%
rename from content/canvas/test/test_2d.line.join.zeroline.join.html
rename to content/canvas/test/test_2d.path.arc.angle.6.html
index fa756ad326f8..148934e17004 100644
--- a/content/canvas/test/test_2d.line.join.zeroline.join.html
+++ b/content/canvas/test/test_2d.path.arc.angle.6.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.join.zeroline.join</title>
+<title>Canvas test: 2d.path.arc.angle.6</title>
+<!-- Testing: arc() draws a full circle when anticlockwise and start > end+2pi -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,25 +26,20 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-ctx.fillStyle = '#0f0';
+ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
-
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 150;
-ctx.lineJoin = 'round';
-
+ctx.fillStyle = '#0f0';
 ctx.beginPath();
 ctx.moveTo(50, 25);
-ctx.lineTo(50, 25);
-ctx.lineTo(50, 25);
-ctx.stroke();
-
+ctx.arc(50, 25, 60, (1024-1)*Math.PI, (512+1/2)*Math.PI, true);
+ctx.fill();
 isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
-isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.empty.html b/content/canvas/test/test_2d.path.arc.empty.html
index 424bb981f0de..d59d1c0c7d3f 100644
--- a/content/canvas/test/test_2d.path.arc.empty.html
+++ b/content/canvas/test/test_2d.path.arc.empty.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.empty</title>
+<!-- Testing: arc() with an empty path does not draw a straight line to the start point -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,14 +26,17 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
 ctx.lineWidth = 50;
 ctx.strokeStyle = '#f00';
 ctx.beginPath();
 ctx.arc(200, 25, 5, 0, 2*Math.PI, true);
 ctx.stroke();
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.end.html b/content/canvas/test/test_2d.path.arc.end.html
index 524242551cf3..756eb0b0edaa 100644
--- a/content/canvas/test/test_2d.path.arc.end.html
+++ b/content/canvas/test/test_2d.path.arc.end.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.end</title>
+<!-- Testing: arc() adds the end point of the arc to the subpath -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,6 +26,8 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
 ctx.lineWidth = 50;
 ctx.strokeStyle = '#0f0';
 ctx.beginPath();
@@ -35,7 +37,8 @@ ctx.lineTo(100, 25);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.negative.html b/content/canvas/test/test_2d.path.arc.negative.html
index 2f67793cce57..db2bbc4160ad 100644
--- a/content/canvas/test/test_2d.path.arc.negative.html
+++ b/content/canvas/test/test_2d.path.arc.negative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.negative</title>
+<!-- Testing: arc() with negative radius throws INDEX_SIZE_ERR -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -18,7 +18,8 @@ var _thrown = undefined; try {
   ctx.arc(0, 0, -1, 0, 0, true);
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.nonempty.html b/content/canvas/test/test_2d.path.arc.nonempty.html
index 18c573162991..0c3bbff25ec7 100644
--- a/content/canvas/test/test_2d.path.arc.nonempty.html
+++ b/content/canvas/test/test_2d.path.arc.nonempty.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.nonempty</title>
+<!-- Testing: arc() with a non-empty path does draw a straight line to the start point -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,6 +26,8 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
 ctx.lineWidth = 50;
 ctx.strokeStyle = '#0f0';
 ctx.beginPath();
@@ -34,7 +36,8 @@ ctx.arc(200, 25, 5, 0, 2*Math.PI, true);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.nonfinite.html b/content/canvas/test/test_2d.path.arc.nonfinite.html
new file mode 100644
index 000000000000..08f7f5236006
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arc.nonfinite.html
@@ -0,0 +1,75 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.nonfinite</title>
+<!-- Testing: arc() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.arc(Infinity, 50, 0, 2*Math.PI, true);
+ctx.arc(-Infinity, 50, 0, 2*Math.PI, true);
+ctx.arc(NaN, 50, 0, 2*Math.PI, true);
+ctx.arc(0, Infinity, 0, 2*Math.PI, true);
+ctx.arc(0, -Infinity, 0, 2*Math.PI, true);
+ctx.arc(0, NaN, 0, 2*Math.PI, true);
+ctx.arc(0, 50, Infinity, 2*Math.PI, true);
+ctx.arc(0, 50, -Infinity, 2*Math.PI, true);
+ctx.arc(0, 50, NaN, 2*Math.PI, true);
+ctx.arc(0, 50, 0, Infinity, true);
+ctx.arc(0, 50, 0, -Infinity, true);
+ctx.arc(0, 50, 0, NaN, true);
+ctx.arc(Infinity, Infinity, 0, 2*Math.PI, true);
+ctx.arc(Infinity, Infinity, Infinity, 2*Math.PI, true);
+ctx.arc(Infinity, Infinity, Infinity, Infinity, true);
+ctx.arc(Infinity, Infinity, 0, Infinity, true);
+ctx.arc(Infinity, 50, Infinity, 2*Math.PI, true);
+ctx.arc(Infinity, 50, Infinity, Infinity, true);
+ctx.arc(Infinity, 50, 0, Infinity, true);
+ctx.arc(0, Infinity, Infinity, 2*Math.PI, true);
+ctx.arc(0, Infinity, Infinity, Infinity, true);
+ctx.arc(0, Infinity, 0, Infinity, true);
+ctx.arc(0, 50, Infinity, Infinity, true);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 90,45, 0,255,0,255, "90,45", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arc.scale.1.html b/content/canvas/test/test_2d.path.arc.scale.1.html
new file mode 100644
index 000000000000..4c0866532cb1
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arc.scale.1.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.scale.1</title>
+<!-- Testing: Non-uniformly scaled arcs are the right shape -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.scale(2, 0.5);
+ctx.fillStyle = '#0f0';
+ctx.beginPath();
+ctx.arc(25, 50, 56, 0, 2*Math.PI, false);
+ctx.fill();
+ctx.fillStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(-25, 50);
+ctx.arc(-25, 50, 24, 0, 2*Math.PI, false);
+ctx.moveTo(75, 50);
+ctx.arc(75, 50, 24, 0, 2*Math.PI, false);
+ctx.moveTo(25, -25);
+ctx.arc(25, -25, 24, 0, 2*Math.PI, false);
+ctx.moveTo(25, 125);
+ctx.arc(25, 125, 24, 0, 2*Math.PI, false);
+ctx.fill();
+
+isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 0);
+isPixel(ctx, 50,0, 0,255,0,255, "50,0", "0,255,0,255", 0);
+isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 0);
+isPixel(ctx, 0,25, 0,255,0,255, "0,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 99,25, 0,255,0,255, "99,25", "0,255,0,255", 0);
+isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 0);
+isPixel(ctx, 50,49, 0,255,0,255, "50,49", "0,255,0,255", 0);
+isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arc.scale.2.html b/content/canvas/test/test_2d.path.arc.scale.2.html
new file mode 100644
index 000000000000..5e339391cf5b
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arc.scale.2.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.scale.2</title>
+<!-- Testing: Highly scaled arcs are the right shape -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.scale(100, 100);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 1.2;
+ctx.beginPath();
+ctx.arc(0, 0, 0.6, 0, Math.PI/2, false);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arc.selfintersect.1.html b/content/canvas/test/test_2d.path.arc.selfintersect.1.html
index c5c61badeb4e..fafe36fe6bbd 100644
--- a/content/canvas/test/test_2d.path.arc.selfintersect.1.html
+++ b/content/canvas/test/test_2d.path.arc.selfintersect.1.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.selfintersect.1</title>
+<!-- Testing: arc() with lineWidth > 2*radius is drawn sensibly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,6 +26,8 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
 ctx.lineWidth = 200;
 ctx.strokeStyle = '#f00';
 ctx.beginPath();
@@ -34,9 +36,10 @@ ctx.stroke();
 ctx.beginPath();
 ctx.arc(0, 0, 25, 0, -Math.PI/2, true);
 ctx.stroke();
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.selfintersect.2.html b/content/canvas/test/test_2d.path.arc.selfintersect.2.html
index 04a8df9d2cfe..65460f973e65 100644
--- a/content/canvas/test/test_2d.path.arc.selfintersect.2.html
+++ b/content/canvas/test/test_2d.path.arc.selfintersect.2.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.selfintersect.2</title>
+<!-- Testing: arc() with lineWidth > 2*radius is drawn sensibly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,6 +26,8 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
 ctx.lineWidth = 180;
 ctx.strokeStyle = '#0f0';
 ctx.beginPath();
@@ -41,7 +43,8 @@ isPixel(ctx, 97,2, 0,255,0,255, "97,2", "0,255,0,255", 0);
 isPixel(ctx, 97,3, 0,255,0,255, "97,3", "0,255,0,255", 0);
 isPixel(ctx, 2,48, 0,255,0,255, "2,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.shape.1.html b/content/canvas/test/test_2d.path.arc.shape.1.html
index 5696e287152f..e2811ccf4efe 100644
--- a/content/canvas/test/test_2d.path.arc.shape.1.html
+++ b/content/canvas/test/test_2d.path.arc.shape.1.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.shape.1</title>
+<!-- Testing: arc() from 0 to pi does not draw anything in the wrong half -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,19 +26,22 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
 ctx.lineWidth = 50;
 ctx.strokeStyle = '#f00';
 ctx.beginPath();
 ctx.arc(50, 50, 50, 0, Math.PI, false);
 ctx.stroke();
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
-isPixel(ctx, 1,1, 0,0,0,0, "1,1", "0,0,0,0", 0);
-isPixel(ctx, 98,1, 0,0,0,0, "98,1", "0,0,0,0", 0);
-isPixel(ctx, 1,48, 0,0,0,0, "1,48", "0,0,0,0", 0);
-isPixel(ctx, 20,48, 0,0,0,0, "20,48", "0,0,0,0", 0);
-isPixel(ctx, 98,48, 0,0,0,0, "98,48", "0,0,0,0", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 20,48, 0,255,0,255, "20,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.shape.2.html b/content/canvas/test/test_2d.path.arc.shape.2.html
index c29da5814ae2..c0f9fe34f3e5 100644
--- a/content/canvas/test/test_2d.path.arc.shape.2.html
+++ b/content/canvas/test/test_2d.path.arc.shape.2.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.shape.2</title>
+<!-- Testing: arc() from 0 to pi draws stuff in the right half -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,6 +26,8 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
 ctx.lineWidth = 100;
 ctx.strokeStyle = '#0f0';
 ctx.beginPath();
@@ -38,7 +40,8 @@ isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 20,48, 0,255,0,255, "20,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.shape.3.html b/content/canvas/test/test_2d.path.arc.shape.3.html
index 6c10ff93ef9a..06c9fb43a435 100644
--- a/content/canvas/test/test_2d.path.arc.shape.3.html
+++ b/content/canvas/test/test_2d.path.arc.shape.3.html
@@ -1,19 +1,31 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.shape.3</title>
+<!-- Testing: arc() from 0 to -pi/2 does not draw anything in the wrong quadrant -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,14 +38,21 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
 ctx.lineWidth = 100;
 ctx.strokeStyle = '#f00';
 ctx.beginPath();
 ctx.arc(0, 50, 50, 0, -Math.PI/2, false);
 ctx.stroke();
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.shape.4.html b/content/canvas/test/test_2d.path.arc.shape.4.html
index 0758de7b9473..57db0274750f 100644
--- a/content/canvas/test/test_2d.path.arc.shape.4.html
+++ b/content/canvas/test/test_2d.path.arc.shape.4.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.shape.4</title>
+<!-- Testing: arc() from 0 to -pi/2 draws stuff in the right quadrant -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,14 +26,21 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
 ctx.lineWidth = 150;
 ctx.strokeStyle = '#0f0';
 ctx.beginPath();
 ctx.arc(-50, 50, 100, 0, -Math.PI/2, true);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.shape.5.html b/content/canvas/test/test_2d.path.arc.shape.5.html
index ca6733a4ca4e..c266d22d7ef0 100644
--- a/content/canvas/test/test_2d.path.arc.shape.5.html
+++ b/content/canvas/test/test_2d.path.arc.shape.5.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.shape.5</title>
+<!-- Testing: arc() from 0 to 5pi does not draw crazy things -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,14 +26,21 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
 ctx.lineWidth = 200;
 ctx.strokeStyle = '#f00';
 ctx.beginPath();
 ctx.arc(300, 0, 100, 0, 5*Math.PI, false);
 ctx.stroke();
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.zero.3.html b/content/canvas/test/test_2d.path.arc.twopie.1.html
similarity index 60%
rename from content/canvas/test/test_2d.path.arc.zero.3.html
rename to content/canvas/test/test_2d.path.arc.twopie.1.html
index 990df924c012..dc50f4cc85a9 100644
--- a/content/canvas/test/test_2d.path.arc.zero.3.html
+++ b/content/canvas/test/test_2d.path.arc.twopie.1.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.zero.3</title>
+<title>Canvas test: 2d.path.arc.twopie.1</title>
+<!-- Testing: arc() draws nothing when end = start + 2pi-e and anticlockwise -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,14 +26,17 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
 ctx.strokeStyle = '#f00';
 ctx.lineWidth = 100;
 ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 2*Math.PI - 1e-4, true);
 ctx.stroke();
-isPixel(ctx, 50,20, 0,0,0,0, "50,20", "0,0,0,0", 0);
+isPixel(ctx, 50,20, 0,255,0,255, "50,20", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.zero.4.html b/content/canvas/test/test_2d.path.arc.twopie.2.html
similarity index 65%
rename from content/canvas/test/test_2d.path.arc.zero.4.html
rename to content/canvas/test/test_2d.path.arc.twopie.2.html
index 9703c9060aff..117d45daa53e 100644
--- a/content/canvas/test/test_2d.path.arc.zero.4.html
+++ b/content/canvas/test/test_2d.path.arc.twopie.2.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.zero.4</title>
+<title>Canvas test: 2d.path.arc.twopie.2</title>
+<!-- Testing: arc() draws a full circle when end = start + 2pi-e and clockwise -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,6 +26,8 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
 ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 100;
 ctx.beginPath();
@@ -33,7 +35,8 @@ ctx.arc(50, 25, 50, 0, 2*Math.PI - 1e-4, false);
 ctx.stroke();
 isPixel(ctx, 50,20, 0,255,0,255, "50,20", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.zero.5.html b/content/canvas/test/test_2d.path.arc.twopie.3.html
similarity index 64%
rename from content/canvas/test/test_2d.path.arc.zero.5.html
rename to content/canvas/test/test_2d.path.arc.twopie.3.html
index d04008264477..c33fac6b2a6f 100644
--- a/content/canvas/test/test_2d.path.arc.zero.5.html
+++ b/content/canvas/test/test_2d.path.arc.twopie.3.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.zero.5</title>
+<title>Canvas test: 2d.path.arc.twopie.3</title>
+<!-- Testing: arc() draws a full circle when end = start + 2pi+e and anticlockwise -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,6 +26,8 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
 ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 100;
 ctx.beginPath();
@@ -33,7 +35,8 @@ ctx.arc(50, 25, 50, 0, 2*Math.PI + 1e-4, true);
 ctx.stroke();
 isPixel(ctx, 50,20, 0,255,0,255, "50,20", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.zero.6.html b/content/canvas/test/test_2d.path.arc.twopie.4.html
similarity index 65%
rename from content/canvas/test/test_2d.path.arc.zero.6.html
rename to content/canvas/test/test_2d.path.arc.twopie.4.html
index f2a21b3bb809..b7d01d4e5dad 100644
--- a/content/canvas/test/test_2d.path.arc.zero.6.html
+++ b/content/canvas/test/test_2d.path.arc.twopie.4.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.zero.6</title>
+<title>Canvas test: 2d.path.arc.twopie.4</title>
+<!-- Testing: arc() draws nothing when end = start + 2pi+e and clockwise -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,6 +26,8 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
 ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 100;
 ctx.beginPath();
@@ -33,7 +35,8 @@ ctx.arc(50, 25, 50, 0, 2*Math.PI + 1e-4, false);
 ctx.stroke();
 isPixel(ctx, 50,20, 0,255,0,255, "50,20", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.zero.1.html b/content/canvas/test/test_2d.path.arc.zero.1.html
index 540b5ff5b9fe..2f5f067e5232 100644
--- a/content/canvas/test/test_2d.path.arc.zero.1.html
+++ b/content/canvas/test/test_2d.path.arc.zero.1.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.zero.1</title>
+<!-- Testing: arc() draws nothing when startAngle = endAngle and anticlockwise -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,14 +26,17 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
 ctx.strokeStyle = '#f00';
 ctx.lineWidth = 100;
 ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 0, true);
 ctx.stroke();
-isPixel(ctx, 50,20, 0,0,0,0, "50,20", "0,0,0,0", 0);
+isPixel(ctx, 50,20, 0,255,0,255, "50,20", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.zero.2.html b/content/canvas/test/test_2d.path.arc.zero.2.html
index 19e5c0b63930..5f4bbdef8032 100644
--- a/content/canvas/test/test_2d.path.arc.zero.2.html
+++ b/content/canvas/test/test_2d.path.arc.zero.2.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.arc.zero.2</title>
+<!-- Testing: arc() draws nothing when startAngle = endAngle and clockwise -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -26,14 +26,17 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
 ctx.strokeStyle = '#f00';
 ctx.lineWidth = 100;
 ctx.beginPath();
 ctx.arc(50, 25, 50, 0, 0, false);
 ctx.stroke();
-isPixel(ctx, 50,20, 0,0,0,0, "50,20", "0,0,0,0", 0);
+isPixel(ctx, 50,20, 0,255,0,255, "50,20", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.zeroradius.html b/content/canvas/test/test_2d.path.arc.zeroradius.html
new file mode 100644
index 000000000000..9ad06ce6f34c
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arc.zeroradius.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.zeroradius</title>
+<!-- Testing: arc() with zero radius draws a line to the start point -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00'
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arc(200, 25, 0, 0, Math.PI, true);
+ctx.stroke();
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arcTo.coincide.1.html b/content/canvas/test/test_2d.path.arcTo.coincide.1.html
new file mode 100644
index 000000000000..67ac2924d4b9
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.coincide.1.html
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.coincide.1</title>
+<!-- Testing: arcTo() has no effect if P0 = P1 -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(0, 25, 50, 1000, 1);
+ctx.lineTo(100, 25);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.arcTo(50, 25, 100, 25, 1);
+ctx.stroke();
+
+todo_isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arcTo.coincide.2.html b/content/canvas/test/test_2d.path.arcTo.coincide.2.html
new file mode 100644
index 000000000000..02671785011c
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.coincide.2.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.coincide.2</title>
+<!-- Testing: arcTo() draws a straight line to P1 if P1 = P2 -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(100, 25, 100, 25, 1);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arcTo.collinear.1.html b/content/canvas/test/test_2d.path.arcTo.collinear.1.html
new file mode 100644
index 000000000000..152b2534af1f
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.collinear.1.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.collinear.1</title>
+<!-- Testing: arcTo() with all points on a line, and P1 between P0/P2, draws a straight line to P1 -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(100, 25, 200, 25, 1);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(-100, 25);
+ctx.arcTo(0, 25, 100, 25, 1);
+ctx.stroke();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arcTo.collinear.2.html b/content/canvas/test/test_2d.path.arcTo.collinear.2.html
new file mode 100644
index 000000000000..7946d5c0db86
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.collinear.2.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.collinear.2</title>
+<!-- Testing: arcTo() with all points on a line, and P2 between P0/P1, draws an infinite line along P1..P2 -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(1000, 25);
+ctx.arcTo(1100, 25, 1050, 25, 1);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(100, 25, -50, 25, 1);
+ctx.stroke();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arcTo.collinear.3.html b/content/canvas/test/test_2d.path.arcTo.collinear.3.html
new file mode 100644
index 000000000000..0f663386f6a8
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.collinear.3.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.collinear.3</title>
+<!-- Testing: arcTo() with all points on a line, and P0 between P1/P2, draws an infinite line along P1..P2 -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(150, 25);
+ctx.arcTo(200, 25, 100, 25, 1);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(100, 25, 50, 25, 1);
+ctx.stroke();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arcTo.emptysubpath.html b/content/canvas/test/test_2d.path.arcTo.emptysubpath.html
new file mode 100644
index 000000000000..98c3557bd1d4
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.emptysubpath.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.emptysubpath</title>
+<!-- Testing: arcTo() does nothing if there are no subpaths -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.arcTo(0, 25, 0, 25, 0.1);
+ctx.arcTo(100, 25, 100, 25, 0.1);
+ctx.stroke();
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.pattern.repeat.missing.html b/content/canvas/test/test_2d.path.arcTo.negative.html
similarity index 55%
rename from content/canvas/test/test_2d.pattern.repeat.missing.html
rename to content/canvas/test/test_2d.path.arcTo.negative.html
index 0f51a4466687..876dd39e37e9 100644
--- a/content/canvas/test/test_2d.pattern.repeat.missing.html
+++ b/content/canvas/test/test_2d.path.arcTo.negative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.repeat.missing</title>
+<title>Canvas test: 2d.path.arcTo.negative</title>
+<!-- Testing: arcTo() with negative radius throws an exception -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -15,10 +15,11 @@ var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
 var _thrown = undefined; try {
-  ctx.createPattern(canvas);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
+  ctx.arcTo(0, 0, 0, 0, -1);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arcTo.nonfinite.html b/content/canvas/test/test_2d.path.arcTo.nonfinite.html
new file mode 100644
index 000000000000..df12d3af026f
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.nonfinite.html
@@ -0,0 +1,91 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.nonfinite</title>
+<!-- Testing: arcTo() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.arcTo(Infinity, 50, 0, 50, 0);
+ctx.arcTo(-Infinity, 50, 0, 50, 0);
+ctx.arcTo(NaN, 50, 0, 50, 0);
+ctx.arcTo(0, Infinity, 0, 50, 0);
+ctx.arcTo(0, -Infinity, 0, 50, 0);
+ctx.arcTo(0, NaN, 0, 50, 0);
+ctx.arcTo(0, 50, Infinity, 50, 0);
+ctx.arcTo(0, 50, -Infinity, 50, 0);
+ctx.arcTo(0, 50, NaN, 50, 0);
+ctx.arcTo(0, 50, 0, Infinity, 0);
+ctx.arcTo(0, 50, 0, -Infinity, 0);
+ctx.arcTo(0, 50, 0, NaN, 0);
+ctx.arcTo(0, 50, 0, 50, Infinity);
+ctx.arcTo(0, 50, 0, 50, -Infinity);
+ctx.arcTo(0, 50, 0, 50, NaN);
+ctx.arcTo(Infinity, Infinity, 0, 50, 0);
+ctx.arcTo(Infinity, Infinity, Infinity, 50, 0);
+ctx.arcTo(Infinity, Infinity, Infinity, Infinity, 0);
+ctx.arcTo(Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.arcTo(Infinity, Infinity, Infinity, 50, Infinity);
+ctx.arcTo(Infinity, Infinity, 0, Infinity, 0);
+ctx.arcTo(Infinity, Infinity, 0, Infinity, Infinity);
+ctx.arcTo(Infinity, Infinity, 0, 50, Infinity);
+ctx.arcTo(Infinity, 50, Infinity, 50, 0);
+ctx.arcTo(Infinity, 50, Infinity, Infinity, 0);
+ctx.arcTo(Infinity, 50, Infinity, Infinity, Infinity);
+ctx.arcTo(Infinity, 50, Infinity, 50, Infinity);
+ctx.arcTo(Infinity, 50, 0, Infinity, 0);
+ctx.arcTo(Infinity, 50, 0, Infinity, Infinity);
+ctx.arcTo(Infinity, 50, 0, 50, Infinity);
+ctx.arcTo(0, Infinity, Infinity, 50, 0);
+ctx.arcTo(0, Infinity, Infinity, Infinity, 0);
+ctx.arcTo(0, Infinity, Infinity, Infinity, Infinity);
+ctx.arcTo(0, Infinity, Infinity, 50, Infinity);
+ctx.arcTo(0, Infinity, 0, Infinity, 0);
+ctx.arcTo(0, Infinity, 0, Infinity, Infinity);
+ctx.arcTo(0, Infinity, 0, 50, Infinity);
+ctx.arcTo(0, 50, Infinity, Infinity, 0);
+ctx.arcTo(0, 50, Infinity, Infinity, Infinity);
+ctx.arcTo(0, 50, Infinity, 50, Infinity);
+ctx.arcTo(0, 50, 0, Infinity, Infinity);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 90,45, 0,255,0,255, "90,45", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arcTo.scale.html b/content/canvas/test/test_2d.path.arcTo.scale.html
new file mode 100644
index 000000000000..0723ef0e9734
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.scale.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.scale</title>
+<!-- Testing: arcTo scales the curve, not just the control points -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 50);
+ctx.translate(100, 0);
+ctx.scale(0.1, 1);
+ctx.arcTo(50, 50, 50, 0, 50);
+ctx.lineTo(-1000, 0);
+ctx.fill();
+
+isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 0);
+isPixel(ctx, 50,0, 0,255,0,255, "50,0", "0,255,0,255", 0);
+isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 0);
+isPixel(ctx, 0,25, 0,255,0,255, "0,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 99,25, 0,255,0,255, "99,25", "0,255,0,255", 0);
+isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 0);
+isPixel(ctx, 50,49, 0,255,0,255, "50,49", "0,255,0,255", 0);
+isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arcTo.shape.curve1.html b/content/canvas/test/test_2d.path.arcTo.shape.curve1.html
new file mode 100644
index 000000000000..82b375b9e464
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.shape.curve1.html
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.shape.curve1</title>
+<!-- Testing: arcTo() curves in the right kind of shape -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var tol = 1.5; // tolerance to avoid antialiasing artifacts
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 10;
+ctx.beginPath();
+ctx.moveTo(10, 25);
+ctx.arcTo(75, 25, 75, 60, 20);
+ctx.stroke();
+
+ctx.fillStyle = '#0f0';
+ctx.beginPath();
+ctx.rect(10, 20, 45, 10);
+ctx.moveTo(80, 45);
+ctx.arc(55, 45, 25+tol, 0, -Math.PI/2, true);
+ctx.arc(55, 45, 15-tol, -Math.PI/2, 0, false);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 55,19, 0,255,0,255, "55,19", "0,255,0,255", 0);
+isPixel(ctx, 55,20, 0,255,0,255, "55,20", "0,255,0,255", 0);
+isPixel(ctx, 55,21, 0,255,0,255, "55,21", "0,255,0,255", 0);
+isPixel(ctx, 64,22, 0,255,0,255, "64,22", "0,255,0,255", 0);
+isPixel(ctx, 65,21, 0,255,0,255, "65,21", "0,255,0,255", 0);
+isPixel(ctx, 72,28, 0,255,0,255, "72,28", "0,255,0,255", 0);
+isPixel(ctx, 73,27, 0,255,0,255, "73,27", "0,255,0,255", 0);
+isPixel(ctx, 78,36, 0,255,0,255, "78,36", "0,255,0,255", 0);
+isPixel(ctx, 79,35, 0,255,0,255, "79,35", "0,255,0,255", 0);
+isPixel(ctx, 80,44, 0,255,0,255, "80,44", "0,255,0,255", 0);
+todo_isPixel(ctx, 80,45, 0,255,0,255, "80,45", "0,255,0,255", 0);
+todo_isPixel(ctx, 80,46, 0,255,0,255, "80,46", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arcTo.shape.curve2.html b/content/canvas/test/test_2d.path.arcTo.shape.curve2.html
new file mode 100644
index 000000000000..d4179cb08d0f
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.shape.curve2.html
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.shape.curve2</title>
+<!-- Testing: arcTo() curves in the right kind of shape -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var tol = 1.5; // tolerance to avoid antialiasing artifacts
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.beginPath();
+ctx.rect(10, 20, 45, 10);
+ctx.moveTo(80, 45);
+ctx.arc(55, 45, 25-tol, 0, -Math.PI/2, true);
+ctx.arc(55, 45, 15+tol, -Math.PI/2, 0, false);
+ctx.fill();
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 10;
+ctx.beginPath();
+ctx.moveTo(10, 25);
+ctx.arcTo(75, 25, 75, 60, 20);
+ctx.stroke();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 55,19, 0,255,0,255, "55,19", "0,255,0,255", 0);
+isPixel(ctx, 55,20, 0,255,0,255, "55,20", "0,255,0,255", 0);
+todo_isPixel(ctx, 55,21, 0,255,0,255, "55,21", "0,255,0,255", 0);
+isPixel(ctx, 64,22, 0,255,0,255, "64,22", "0,255,0,255", 0);
+isPixel(ctx, 65,21, 0,255,0,255, "65,21", "0,255,0,255", 0);
+todo_isPixel(ctx, 72,28, 0,255,0,255, "72,28", "0,255,0,255", 0);
+isPixel(ctx, 73,27, 0,255,0,255, "73,27", "0,255,0,255", 0);
+isPixel(ctx, 78,36, 0,255,0,255, "78,36", "0,255,0,255", 0);
+isPixel(ctx, 79,35, 0,255,0,255, "79,35", "0,255,0,255", 0);
+isPixel(ctx, 80,44, 0,255,0,255, "80,44", "0,255,0,255", 0);
+isPixel(ctx, 80,45, 0,255,0,255, "80,45", "0,255,0,255", 0);
+isPixel(ctx, 80,46, 0,255,0,255, "80,46", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arcTo.shape.end.html b/content/canvas/test/test_2d.path.arcTo.shape.end.html
new file mode 100644
index 000000000000..3b53a2c5cdc8
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.shape.end.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.shape.end</title>
+<!-- Testing: arcTo() does not draw anything from P1 to P2 -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.moveTo(-100, -100);
+ctx.arcTo(-100, 25, 200, 25, 10);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+todo_isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arcTo.shape.start.html b/content/canvas/test/test_2d.path.arcTo.shape.start.html
new file mode 100644
index 000000000000..cf30a599a0bd
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.shape.start.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.shape.start</title>
+<!-- Testing: arcTo() draws a straight line from P0 to P1 -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(200, 25, 200, 50, 10);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+todo_isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arcTo.transformation.html b/content/canvas/test/test_2d.path.arcTo.transformation.html
new file mode 100644
index 000000000000..098f532d2b6c
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.transformation.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.transformation</title>
+<!-- Testing: arcTo joins up to the last subpath point correctly -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 50);
+ctx.translate(100, 0);
+ctx.arcTo(50, 50, 50, 0, 50);
+ctx.lineTo(-100, 0);
+ctx.fill();
+
+isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 0);
+isPixel(ctx, 50,0, 0,255,0,255, "50,0", "0,255,0,255", 0);
+isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 0);
+isPixel(ctx, 0,25, 0,255,0,255, "0,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 99,25, 0,255,0,255, "99,25", "0,255,0,255", 0);
+isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 0);
+isPixel(ctx, 50,49, 0,255,0,255, "50,49", "0,255,0,255", 0);
+isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arcTo.zero.1.html b/content/canvas/test/test_2d.path.arcTo.zero.1.html
new file mode 100644
index 000000000000..b22d7a923965
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.zero.1.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.zero.1</title>
+<!-- Testing: arcTo() with zero radius draws a straight line from P0 to P1 -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(100, 25, 100, 100, 0);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(0, -25);
+ctx.arcTo(50, -25, 50, 50, 0);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.arcTo.zero.2.html b/content/canvas/test/test_2d.path.arcTo.zero.2.html
new file mode 100644
index 000000000000..883c9201d658
--- /dev/null
+++ b/content/canvas/test/test_2d.path.arcTo.zero.2.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arcTo.zero.2</title>
+<!-- Testing: arcTo() with zero radius draws a straight line from P0 to P1, even when all points are collinear -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(100, 25, -100, 25, 0);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(100, 25);
+ctx.arcTo(200, 25, 50, 25, 0);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.beginPath.html b/content/canvas/test/test_2d.path.beginPath.html
index f922595893e5..15a3d0fad1c7 100644
--- a/content/canvas/test/test_2d.path.beginPath.html
+++ b/content/canvas/test/test_2d.path.beginPath.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.beginPath</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.fillStyle = '#f00';
 ctx.fill();
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.bezierCurveTo.basic.html b/content/canvas/test/test_2d.path.bezierCurveTo.basic.html
index 0db66fdb6e75..44124ef39a88 100644
--- a/content/canvas/test/test_2d.path.bezierCurveTo.basic.html
+++ b/content/canvas/test/test_2d.path.bezierCurveTo.basic.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.bezierCurveTo.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.bezierCurveTo(100, 25, 100, 25, 100, 25);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.bezierCurveTo.emptysubpath.html b/content/canvas/test/test_2d.path.bezierCurveTo.emptysubpath.html
index a40352daaecc..d0cd504a4464 100644
--- a/content/canvas/test/test_2d.path.bezierCurveTo.emptysubpath.html
+++ b/content/canvas/test/test_2d.path.bezierCurveTo.emptysubpath.html
@@ -2,25 +2,33 @@
 <title>Canvas test: 2d.path.bezierCurveTo.emptysubpath</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -37,7 +45,8 @@ ctx.bezierCurveTo(100, 25, 100, 25, 100, 25);
 ctx.stroke();
 todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.bezierCurveTo.nonfinite.html b/content/canvas/test/test_2d.path.bezierCurveTo.nonfinite.html
new file mode 100644
index 000000000000..f83ebb3048dc
--- /dev/null
+++ b/content/canvas/test/test_2d.path.bezierCurveTo.nonfinite.html
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.bezierCurveTo.nonfinite</title>
+<!-- Testing: bezierCurveTo() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.bezierCurveTo(Infinity, 50, 0, 50, 0, 50);
+ctx.bezierCurveTo(-Infinity, 50, 0, 50, 0, 50);
+ctx.bezierCurveTo(NaN, 50, 0, 50, 0, 50);
+ctx.bezierCurveTo(0, Infinity, 0, 50, 0, 50);
+ctx.bezierCurveTo(0, -Infinity, 0, 50, 0, 50);
+ctx.bezierCurveTo(0, NaN, 0, 50, 0, 50);
+ctx.bezierCurveTo(0, 50, Infinity, 50, 0, 50);
+ctx.bezierCurveTo(0, 50, -Infinity, 50, 0, 50);
+ctx.bezierCurveTo(0, 50, NaN, 50, 0, 50);
+ctx.bezierCurveTo(0, 50, 0, Infinity, 0, 50);
+ctx.bezierCurveTo(0, 50, 0, -Infinity, 0, 50);
+ctx.bezierCurveTo(0, 50, 0, NaN, 0, 50);
+ctx.bezierCurveTo(0, 50, 0, 50, Infinity, 50);
+ctx.bezierCurveTo(0, 50, 0, 50, -Infinity, 50);
+ctx.bezierCurveTo(0, 50, 0, 50, NaN, 50);
+ctx.bezierCurveTo(0, 50, 0, 50, 0, Infinity);
+ctx.bezierCurveTo(0, 50, 0, 50, 0, -Infinity);
+ctx.bezierCurveTo(0, 50, 0, 50, 0, NaN);
+ctx.bezierCurveTo(Infinity, Infinity, 0, 50, 0, 50);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, 50, 0, 50);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, Infinity, 0, 50);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, Infinity, 0, Infinity);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, 50, Infinity, 50);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, 50, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, 50, 0, Infinity);
+ctx.bezierCurveTo(Infinity, Infinity, 0, Infinity, 0, 50);
+ctx.bezierCurveTo(Infinity, Infinity, 0, Infinity, Infinity, 50);
+ctx.bezierCurveTo(Infinity, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, Infinity, 0, Infinity, 0, Infinity);
+ctx.bezierCurveTo(Infinity, Infinity, 0, 50, Infinity, 50);
+ctx.bezierCurveTo(Infinity, Infinity, 0, 50, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, Infinity, 0, 50, 0, Infinity);
+ctx.bezierCurveTo(Infinity, 50, Infinity, 50, 0, 50);
+ctx.bezierCurveTo(Infinity, 50, Infinity, Infinity, 0, 50);
+ctx.bezierCurveTo(Infinity, 50, Infinity, Infinity, Infinity, 50);
+ctx.bezierCurveTo(Infinity, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, 50, Infinity, Infinity, 0, Infinity);
+ctx.bezierCurveTo(Infinity, 50, Infinity, 50, Infinity, 50);
+ctx.bezierCurveTo(Infinity, 50, Infinity, 50, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, 50, Infinity, 50, 0, Infinity);
+ctx.bezierCurveTo(Infinity, 50, 0, Infinity, 0, 50);
+ctx.bezierCurveTo(Infinity, 50, 0, Infinity, Infinity, 50);
+ctx.bezierCurveTo(Infinity, 50, 0, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, 50, 0, Infinity, 0, Infinity);
+ctx.bezierCurveTo(Infinity, 50, 0, 50, Infinity, 50);
+ctx.bezierCurveTo(Infinity, 50, 0, 50, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, 50, 0, 50, 0, Infinity);
+ctx.bezierCurveTo(0, Infinity, Infinity, 50, 0, 50);
+ctx.bezierCurveTo(0, Infinity, Infinity, Infinity, 0, 50);
+ctx.bezierCurveTo(0, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.bezierCurveTo(0, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(0, Infinity, Infinity, Infinity, 0, Infinity);
+ctx.bezierCurveTo(0, Infinity, Infinity, 50, Infinity, 50);
+ctx.bezierCurveTo(0, Infinity, Infinity, 50, Infinity, Infinity);
+ctx.bezierCurveTo(0, Infinity, Infinity, 50, 0, Infinity);
+ctx.bezierCurveTo(0, Infinity, 0, Infinity, 0, 50);
+ctx.bezierCurveTo(0, Infinity, 0, Infinity, Infinity, 50);
+ctx.bezierCurveTo(0, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(0, Infinity, 0, Infinity, 0, Infinity);
+ctx.bezierCurveTo(0, Infinity, 0, 50, Infinity, 50);
+ctx.bezierCurveTo(0, Infinity, 0, 50, Infinity, Infinity);
+ctx.bezierCurveTo(0, Infinity, 0, 50, 0, Infinity);
+ctx.bezierCurveTo(0, 50, Infinity, Infinity, 0, 50);
+ctx.bezierCurveTo(0, 50, Infinity, Infinity, Infinity, 50);
+ctx.bezierCurveTo(0, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(0, 50, Infinity, Infinity, 0, Infinity);
+ctx.bezierCurveTo(0, 50, Infinity, 50, Infinity, 50);
+ctx.bezierCurveTo(0, 50, Infinity, 50, Infinity, Infinity);
+ctx.bezierCurveTo(0, 50, Infinity, 50, 0, Infinity);
+ctx.bezierCurveTo(0, 50, 0, Infinity, Infinity, 50);
+ctx.bezierCurveTo(0, 50, 0, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(0, 50, 0, Infinity, 0, Infinity);
+ctx.bezierCurveTo(0, 50, 0, 50, Infinity, Infinity);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 90,45, 0,255,0,255, "90,45", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.bezierCurveTo.scaled.html b/content/canvas/test/test_2d.path.bezierCurveTo.scaled.html
index ebf090ba1581..1a6871395909 100644
--- a/content/canvas/test/test_2d.path.bezierCurveTo.scaled.html
+++ b/content/canvas/test/test_2d.path.bezierCurveTo.scaled.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.bezierCurveTo.scaled</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -39,7 +38,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.bezierCurveTo.shape.html b/content/canvas/test/test_2d.path.bezierCurveTo.shape.html
index 119e6240eaed..f69f526d723f 100644
--- a/content/canvas/test/test_2d.path.bezierCurveTo.shape.html
+++ b/content/canvas/test/test_2d.path.bezierCurveTo.shape.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.bezierCurveTo.shape</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -38,7 +37,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.clip.basic.1.html b/content/canvas/test/test_2d.path.clip.basic.1.html
index 2276bd53f009..febc4f22be49 100644
--- a/content/canvas/test/test_2d.path.clip.basic.1.html
+++ b/content/canvas/test/test_2d.path.clip.basic.1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.clip.basic.1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -38,7 +37,8 @@ ctx.fillRect(0, 0, 100, 50);
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.clip.basic.2.html b/content/canvas/test/test_2d.path.clip.basic.2.html
index 48950cd6883c..e5e592d9f846 100644
--- a/content/canvas/test/test_2d.path.clip.basic.2.html
+++ b/content/canvas/test/test_2d.path.clip.basic.2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.clip.basic.2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -38,7 +37,8 @@ ctx.fillRect(0, 0, 100, 50);
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.clip.empty.html b/content/canvas/test/test_2d.path.clip.empty.html
index c07d98ac220e..ab15a1a83ede 100644
--- a/content/canvas/test/test_2d.path.clip.empty.html
+++ b/content/canvas/test/test_2d.path.clip.empty.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.clip.empty</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -37,7 +36,8 @@ ctx.fillRect(0, 0, 100, 50);
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.clip.intersect.html b/content/canvas/test/test_2d.path.clip.intersect.html
index 1cfd4b3deab6..839ef7c7ba63 100644
--- a/content/canvas/test/test_2d.path.clip.intersect.html
+++ b/content/canvas/test/test_2d.path.clip.intersect.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.clip.intersect</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -41,7 +40,8 @@ ctx.fillRect(0, 0, 100, 50);
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.clip.unaffected.html b/content/canvas/test/test_2d.path.clip.unaffected.html
index fe6f2d3ab377..63f175219f77 100644
--- a/content/canvas/test/test_2d.path.clip.unaffected.html
+++ b/content/canvas/test/test_2d.path.clip.unaffected.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.clip.unaffected</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -43,7 +42,8 @@ ctx.fill();
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.clip.winding.1.html b/content/canvas/test/test_2d.path.clip.winding.1.html
index 2a216190517c..3aa098ffda26 100644
--- a/content/canvas/test/test_2d.path.clip.winding.1.html
+++ b/content/canvas/test/test_2d.path.clip.winding.1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.clip.winding.1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -46,7 +45,8 @@ ctx.fillRect(0, 0, 100, 50);
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.clip.winding.2.html b/content/canvas/test/test_2d.path.clip.winding.2.html
index 42a4c07702b6..fbc157763330 100644
--- a/content/canvas/test/test_2d.path.clip.winding.2.html
+++ b/content/canvas/test/test_2d.path.clip.winding.2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.clip.winding.2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -50,7 +49,8 @@ ctx.fillRect(0, 0, 100, 50);
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.closePath.empty.html b/content/canvas/test/test_2d.path.closePath.empty.html
index 58ffafea7126..44676c33c176 100644
--- a/content/canvas/test/test_2d.path.closePath.empty.html
+++ b/content/canvas/test/test_2d.path.closePath.empty.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.closePath.empty</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -31,7 +30,8 @@ ctx.fillStyle = '#f00';
 ctx.fill();
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.closePath.newline.html b/content/canvas/test/test_2d.path.closePath.newline.html
index c4db68105242..9b9f7c04471c 100644
--- a/content/canvas/test/test_2d.path.closePath.newline.html
+++ b/content/canvas/test/test_2d.path.closePath.newline.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.closePath.newline</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -36,7 +35,8 @@ ctx.closePath();
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.closePath.nextpoint.html b/content/canvas/test/test_2d.path.closePath.nextpoint.html
index f52415cb1c85..d207f463a9c4 100644
--- a/content/canvas/test/test_2d.path.closePath.nextpoint.html
+++ b/content/canvas/test/test_2d.path.closePath.nextpoint.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.closePath.nextpoint</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +34,8 @@ ctx.lineTo(1000, 25);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.fill.closed.basic.html b/content/canvas/test/test_2d.path.fill.closed.basic.html
index cb7e78ae1214..ffe02a30b471 100644
--- a/content/canvas/test/test_2d.path.fill.closed.basic.html
+++ b/content/canvas/test/test_2d.path.fill.closed.basic.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.fill.closed.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -38,7 +37,8 @@ ctx.fill();
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.fill.closed.unaffected.html b/content/canvas/test/test_2d.path.fill.closed.unaffected.html
index 0e1ae171fa57..0480c6a647b2 100644
--- a/content/canvas/test/test_2d.path.fill.closed.unaffected.html
+++ b/content/canvas/test/test_2d.path.fill.closed.unaffected.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.fill.closed.unaffected</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -41,7 +40,8 @@ ctx.fill();
 isPixel(ctx, 90,10, 0,255,0,255, "90,10", "0,255,0,255", 0);
 isPixel(ctx, 10,40, 0,255,0,255, "10,40", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.fill.overlap.html b/content/canvas/test/test_2d.path.fill.overlap.html
new file mode 100644
index 000000000000..4fb81e9ccbf0
--- /dev/null
+++ b/content/canvas/test/test_2d.path.fill.overlap.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.fill.overlap</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#000';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.rect(0, 0, 100, 50);
+ctx.closePath();
+ctx.rect(10, 10, 80, 30);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.fill.winding.add.html b/content/canvas/test/test_2d.path.fill.winding.add.html
index 9b34a99cc50f..bbda45ba503e 100644
--- a/content/canvas/test/test_2d.path.fill.winding.add.html
+++ b/content/canvas/test/test_2d.path.fill.winding.add.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.fill.winding.add</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -43,7 +42,8 @@ ctx.fill();
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.fill.winding.subtract.1.html b/content/canvas/test/test_2d.path.fill.winding.subtract.1.html
index 0b0124274d2a..3167fd77d42c 100644
--- a/content/canvas/test/test_2d.path.fill.winding.subtract.1.html
+++ b/content/canvas/test/test_2d.path.fill.winding.subtract.1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.fill.winding.subtract.1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -43,7 +42,8 @@ ctx.fill();
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.fill.winding.subtract.2.html b/content/canvas/test/test_2d.path.fill.winding.subtract.2.html
index af4dd6d3dd33..ca5742e586a5 100644
--- a/content/canvas/test/test_2d.path.fill.winding.subtract.2.html
+++ b/content/canvas/test/test_2d.path.fill.winding.subtract.2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.fill.winding.subtract.2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -42,7 +41,8 @@ ctx.fill();
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.fill.winding.subtract.3.html b/content/canvas/test/test_2d.path.fill.winding.subtract.3.html
index 6774705c9169..b7b602e10401 100644
--- a/content/canvas/test/test_2d.path.fill.winding.subtract.3.html
+++ b/content/canvas/test/test_2d.path.fill.winding.subtract.3.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.fill.winding.subtract.3</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -48,7 +47,8 @@ ctx.fill();
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.initial.html b/content/canvas/test/test_2d.path.initial.html
index e1d08afd12c4..a488353ba349 100644
--- a/content/canvas/test/test_2d.path.initial.html
+++ b/content/canvas/test/test_2d.path.initial.html
@@ -2,25 +2,33 @@
 <title>Canvas test: 2d.path.initial</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -38,7 +46,8 @@ ctx.fillStyle = '#f00';
 ctx.fill();
 todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.isPointInPath.arc.html b/content/canvas/test/test_2d.path.isPointInPath.arc.html
new file mode 100644
index 000000000000..75bfdb1fa396
--- /dev/null
+++ b/content/canvas/test/test_2d.path.isPointInPath.arc.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.arc</title>
+<!-- Testing: isPointInPath() works on arcs -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.arc(50, 25, 10, 0, Math.PI, false);
+ok(ctx.isPointInPath(50, 10) === false, "ctx.isPointInPath(50, 10) === false");
+ok(ctx.isPointInPath(50, 20) === false, "ctx.isPointInPath(50, 20) === false");
+ok(ctx.isPointInPath(50, 30) === true, "ctx.isPointInPath(50, 30) === true");
+ok(ctx.isPointInPath(50, 40) === false, "ctx.isPointInPath(50, 40) === false");
+ok(ctx.isPointInPath(30, 20) === false, "ctx.isPointInPath(30, 20) === false");
+ok(ctx.isPointInPath(70, 20) === false, "ctx.isPointInPath(70, 20) === false");
+ok(ctx.isPointInPath(30, 30) === false, "ctx.isPointInPath(30, 30) === false");
+ok(ctx.isPointInPath(70, 30) === false, "ctx.isPointInPath(70, 30) === false");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.isPointInPath.basic.1.html b/content/canvas/test/test_2d.path.isPointInPath.basic.1.html
index 9e13ace95a06..d4f8f412afb9 100644
--- a/content/canvas/test/test_2d.path.isPointInPath.basic.1.html
+++ b/content/canvas/test/test_2d.path.isPointInPath.basic.1.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.isPointInPath.basic.1</title>
+<!-- Testing: isPointInPath() detects whether the point is inside the path -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,8 +16,10 @@ var ctx = canvas.getContext('2d');
 
 ctx.rect(0, 0, 20, 20);
 ok(ctx.isPointInPath(10, 10) === true, "ctx.isPointInPath(10, 10) === true");
+ok(ctx.isPointInPath(30, 10) === false, "ctx.isPointInPath(30, 10) === false");
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.isPointInPath.basic.2.html b/content/canvas/test/test_2d.path.isPointInPath.basic.2.html
index 69d941541f38..6f259dacb3f2 100644
--- a/content/canvas/test/test_2d.path.isPointInPath.basic.2.html
+++ b/content/canvas/test/test_2d.path.isPointInPath.basic.2.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.isPointInPath.basic.2</title>
+<!-- Testing: isPointInPath() detects whether the point is inside the path -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,8 +16,10 @@ var ctx = canvas.getContext('2d');
 
 ctx.rect(20, 0, 20, 20);
 ok(ctx.isPointInPath(10, 10) === false, "ctx.isPointInPath(10, 10) === false");
+ok(ctx.isPointInPath(30, 10) === true, "ctx.isPointInPath(30, 10) === true");
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.isPointInPath.bezier.html b/content/canvas/test/test_2d.path.isPointInPath.bezier.html
new file mode 100644
index 000000000000..e421e401088c
--- /dev/null
+++ b/content/canvas/test/test_2d.path.isPointInPath.bezier.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.bezier</title>
+<!-- Testing: isPointInPath() works on Bezier curves -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.moveTo(25, 25);
+ctx.bezierCurveTo(50, -50, 50, 100, 75, 25);
+ok(ctx.isPointInPath(25, 20) == false, "ctx.isPointInPath(25, 20) == false");
+ok(ctx.isPointInPath(25, 30) == false, "ctx.isPointInPath(25, 30) == false");
+ok(ctx.isPointInPath(30, 20) == true, "ctx.isPointInPath(30, 20) == true");
+ok(ctx.isPointInPath(30, 30) == false, "ctx.isPointInPath(30, 30) == false");
+ok(ctx.isPointInPath(40, 2) == false, "ctx.isPointInPath(40, 2) == false");
+ok(ctx.isPointInPath(40, 20) == true, "ctx.isPointInPath(40, 20) == true");
+ok(ctx.isPointInPath(40, 30) == false, "ctx.isPointInPath(40, 30) == false");
+ok(ctx.isPointInPath(40, 47) == false, "ctx.isPointInPath(40, 47) == false");
+ok(ctx.isPointInPath(45, 20) == true, "ctx.isPointInPath(45, 20) == true");
+ok(ctx.isPointInPath(45, 30) == false, "ctx.isPointInPath(45, 30) == false");
+ok(ctx.isPointInPath(55, 20) == false, "ctx.isPointInPath(55, 20) == false");
+ok(ctx.isPointInPath(55, 30) == true, "ctx.isPointInPath(55, 30) == true");
+ok(ctx.isPointInPath(60, 2) == false, "ctx.isPointInPath(60, 2) == false");
+ok(ctx.isPointInPath(60, 20) == false, "ctx.isPointInPath(60, 20) == false");
+ok(ctx.isPointInPath(60, 30) == true, "ctx.isPointInPath(60, 30) == true");
+ok(ctx.isPointInPath(60, 47) == false, "ctx.isPointInPath(60, 47) == false");
+ok(ctx.isPointInPath(70, 20) == false, "ctx.isPointInPath(70, 20) == false");
+ok(ctx.isPointInPath(70, 30) == true, "ctx.isPointInPath(70, 30) == true");
+ok(ctx.isPointInPath(75, 20) == false, "ctx.isPointInPath(75, 20) == false");
+ok(ctx.isPointInPath(75, 30) == false, "ctx.isPointInPath(75, 30) == false");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.isPointInPath.bigarc.html b/content/canvas/test/test_2d.path.isPointInPath.bigarc.html
new file mode 100644
index 000000000000..2c7e343055d2
--- /dev/null
+++ b/content/canvas/test/test_2d.path.isPointInPath.bigarc.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.bigarc</title>
+<!-- Testing: isPointInPath() works on unclosed arcs larger than 2pi -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.arc(50, 25, 10, 0, 7, false);
+ok(ctx.isPointInPath(50, 10) === false, "ctx.isPointInPath(50, 10) === false");
+ok(ctx.isPointInPath(50, 20) === true, "ctx.isPointInPath(50, 20) === true");
+ok(ctx.isPointInPath(50, 30) === true, "ctx.isPointInPath(50, 30) === true");
+ok(ctx.isPointInPath(50, 40) === false, "ctx.isPointInPath(50, 40) === false");
+ok(ctx.isPointInPath(30, 20) === false, "ctx.isPointInPath(30, 20) === false");
+ok(ctx.isPointInPath(70, 20) === false, "ctx.isPointInPath(70, 20) === false");
+ok(ctx.isPointInPath(30, 30) === false, "ctx.isPointInPath(30, 30) === false");
+ok(ctx.isPointInPath(70, 30) === false, "ctx.isPointInPath(70, 30) === false");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.isPointInPath.edge.html b/content/canvas/test/test_2d.path.isPointInPath.edge.html
new file mode 100644
index 000000000000..77d7981544e0
--- /dev/null
+++ b/content/canvas/test/test_2d.path.isPointInPath.edge.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.edge</title>
+<!-- Testing: isPointInPath() counts points on the path as being inside -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.rect(0, 0, 20, 20);
+todo(ctx.isPointInPath(0, 0) === true, "ctx.isPointInPath(0, 0) === true");
+ok(ctx.isPointInPath(10, 0) === true, "ctx.isPointInPath(10, 0) === true");
+ok(ctx.isPointInPath(20, 0) === true, "ctx.isPointInPath(20, 0) === true");
+ok(ctx.isPointInPath(20, 10) === true, "ctx.isPointInPath(20, 10) === true");
+ok(ctx.isPointInPath(20, 20) === true, "ctx.isPointInPath(20, 20) === true");
+ok(ctx.isPointInPath(10, 20) === true, "ctx.isPointInPath(10, 20) === true");
+ok(ctx.isPointInPath(0, 20) === true, "ctx.isPointInPath(0, 20) === true");
+ok(ctx.isPointInPath(0, 10) === true, "ctx.isPointInPath(0, 10) === true");
+ok(ctx.isPointInPath(10, -0.01) === false, "ctx.isPointInPath(10, -0.01) === false");
+ok(ctx.isPointInPath(10, 20.01) === false, "ctx.isPointInPath(10, 20.01) === false");
+ok(ctx.isPointInPath(-0.01, 10) === false, "ctx.isPointInPath(-0.01, 10) === false");
+ok(ctx.isPointInPath(20.01, 10) === false, "ctx.isPointInPath(20.01, 10) === false");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.isPointInPath.empty.html b/content/canvas/test/test_2d.path.isPointInPath.empty.html
index 5a0388fdeb00..6866e16e47f0 100644
--- a/content/canvas/test/test_2d.path.isPointInPath.empty.html
+++ b/content/canvas/test/test_2d.path.isPointInPath.empty.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.isPointInPath.empty</title>
+<!-- Testing: isPointInPath() works when there is no path -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(ctx.isPointInPath(0, 0) === false, "ctx.isPointInPath(0, 0) === false");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.isPointInPath.nonfinite.html b/content/canvas/test/test_2d.path.isPointInPath.nonfinite.html
new file mode 100644
index 000000000000..d74fa161b3c2
--- /dev/null
+++ b/content/canvas/test/test_2d.path.isPointInPath.nonfinite.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.nonfinite</title>
+<!-- Testing: isPointInPath() returns false for non-finite arguments -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.rect(-100, -50, 200, 100);
+ok(ctx.isPointInPath(Infinity, 0) === false, "ctx.isPointInPath(Infinity, 0) === false");
+ok(ctx.isPointInPath(-Infinity, 0) === false, "ctx.isPointInPath(-Infinity, 0) === false");
+ok(ctx.isPointInPath(NaN, 0) === false, "ctx.isPointInPath(NaN, 0) === false");
+ok(ctx.isPointInPath(0, Infinity) === false, "ctx.isPointInPath(0, Infinity) === false");
+ok(ctx.isPointInPath(0, -Infinity) === false, "ctx.isPointInPath(0, -Infinity) === false");
+ok(ctx.isPointInPath(0, NaN) === false, "ctx.isPointInPath(0, NaN) === false");
+ok(ctx.isPointInPath(NaN, NaN) === false, "ctx.isPointInPath(NaN, NaN) === false");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.isPointInPath.outside.html b/content/canvas/test/test_2d.path.isPointInPath.outside.html
new file mode 100644
index 000000000000..af21befb294b
--- /dev/null
+++ b/content/canvas/test/test_2d.path.isPointInPath.outside.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.outside</title>
+<!-- Testing: isPointInPath() works on paths outside the canvas -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.rect(0, -100, 20, 20);
+ctx.rect(20, -10, 20, 20);
+ok(ctx.isPointInPath(10, -110) === false, "ctx.isPointInPath(10, -110) === false");
+ok(ctx.isPointInPath(10, -90) === true, "ctx.isPointInPath(10, -90) === true");
+ok(ctx.isPointInPath(10, -70) === false, "ctx.isPointInPath(10, -70) === false");
+ok(ctx.isPointInPath(30, -20) === false, "ctx.isPointInPath(30, -20) === false");
+ok(ctx.isPointInPath(30, 0) === true, "ctx.isPointInPath(30, 0) === true");
+ok(ctx.isPointInPath(30, 20) === false, "ctx.isPointInPath(30, 20) === false");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.isPointInPath.subpath.html b/content/canvas/test/test_2d.path.isPointInPath.subpath.html
new file mode 100644
index 000000000000..d05cbcad801e
--- /dev/null
+++ b/content/canvas/test/test_2d.path.isPointInPath.subpath.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.subpath</title>
+<!-- Testing: isPointInPath() uses the current path, not just the subpath -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.rect(0, 0, 20, 20);
+ctx.beginPath();
+ctx.rect(20, 0, 20, 20);
+ctx.closePath();
+ctx.rect(40, 0, 20, 20);
+ok(ctx.isPointInPath(10, 10) === false, "ctx.isPointInPath(10, 10) === false");
+ok(ctx.isPointInPath(30, 10) === true, "ctx.isPointInPath(30, 10) === true");
+ok(ctx.isPointInPath(50, 10) === true, "ctx.isPointInPath(50, 10) === true");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.isPointInPath.transform.1.html b/content/canvas/test/test_2d.path.isPointInPath.transform.1.html
index 192e7f8635a2..20e1daacad9a 100644
--- a/content/canvas/test/test_2d.path.isPointInPath.transform.1.html
+++ b/content/canvas/test/test_2d.path.isPointInPath.transform.1.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.transform.1</title>
+<title>Canvas test: 2d.path.isPointInPath.transform.1 - bug 405300</title>
+<!-- Testing: isPointInPath() handles transformations correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -23,7 +23,8 @@ todo(ctx.isPointInPath(51, 10) === true, "ctx.isPointInPath(51, 10) === true");
 todo(ctx.isPointInPath(69, 10) === true, "ctx.isPointInPath(69, 10) === true");
 ok(ctx.isPointInPath(71, 10) === false, "ctx.isPointInPath(71, 10) === false");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.isPointInPath.transform.2.html b/content/canvas/test/test_2d.path.isPointInPath.transform.2.html
index f586cc481483..eab57e75eee8 100644
--- a/content/canvas/test/test_2d.path.isPointInPath.transform.2.html
+++ b/content/canvas/test/test_2d.path.isPointInPath.transform.2.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.transform.2</title>
+<title>Canvas test: 2d.path.isPointInPath.transform.2 - bug 405300</title>
+<!-- Testing: isPointInPath() handles transformations correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,16 +14,17 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-ctx.rect(0, 0, 20, 20);
+ctx.rect(50, 0, 20, 20);
 ctx.translate(50, 0);
-todo(ctx.isPointInPath(-40, 10) === false, "ctx.isPointInPath(-40, 10) === false");
-ok(ctx.isPointInPath(10, 10) === false, "ctx.isPointInPath(10, 10) === false");
+ok(ctx.isPointInPath(-40, 10) === false, "ctx.isPointInPath(-40, 10) === false");
+todo(ctx.isPointInPath(10, 10) === false, "ctx.isPointInPath(10, 10) === false");
 ok(ctx.isPointInPath(49, 10) === false, "ctx.isPointInPath(49, 10) === false");
 todo(ctx.isPointInPath(51, 10) === true, "ctx.isPointInPath(51, 10) === true");
 todo(ctx.isPointInPath(69, 10) === true, "ctx.isPointInPath(69, 10) === true");
 ok(ctx.isPointInPath(71, 10) === false, "ctx.isPointInPath(71, 10) === false");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.isPointInPath.transform.3.html b/content/canvas/test/test_2d.path.isPointInPath.transform.3.html
index a18864d464e8..78a80020df0d 100644
--- a/content/canvas/test/test_2d.path.isPointInPath.transform.3.html
+++ b/content/canvas/test/test_2d.path.isPointInPath.transform.3.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.transform.3</title>
+<title>Canvas test: 2d.path.isPointInPath.transform.3 - bug 405300</title>
+<!-- Testing: isPointInPath() handles transformations correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -23,7 +23,8 @@ todo(ctx.isPointInPath(51, 10) === true, "ctx.isPointInPath(51, 10) === true");
 todo(ctx.isPointInPath(69, 10) === true, "ctx.isPointInPath(69, 10) === true");
 ok(ctx.isPointInPath(71, 10) === false, "ctx.isPointInPath(71, 10) === false");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.isPointInPath.unclosed.html b/content/canvas/test/test_2d.path.isPointInPath.unclosed.html
index 0228863d89f4..06a4f7990fff 100644
--- a/content/canvas/test/test_2d.path.isPointInPath.unclosed.html
+++ b/content/canvas/test/test_2d.path.isPointInPath.unclosed.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.isPointInPath.unclosed</title>
+<!-- Testing: isPointInPath() works on unclosed subpaths -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -19,8 +19,10 @@ ctx.lineTo(20, 0);
 ctx.lineTo(20, 20);
 ctx.lineTo(0, 20);
 ok(ctx.isPointInPath(10, 10) === true, "ctx.isPointInPath(10, 10) === true");
+ok(ctx.isPointInPath(30, 10) === false, "ctx.isPointInPath(30, 10) === false");
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.isPointInPath.winding.html b/content/canvas/test/test_2d.path.isPointInPath.winding.html
index 7bb3cfc5bc69..55b5321589fa 100644
--- a/content/canvas/test/test_2d.path.isPointInPath.winding.html
+++ b/content/canvas/test/test_2d.path.isPointInPath.winding.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.isPointInPath.winding</title>
+<!-- Testing: isPointInPath() uses the non-zero winding number rule -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,6 +14,7 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+// Create a square ring, using opposite windings to make a hole in the centre
 ctx.moveTo(0, 0);
 ctx.lineTo(50, 0);
 ctx.lineTo(50, 50);
@@ -24,6 +25,7 @@ ctx.lineTo(10, 40);
 ctx.lineTo(40, 40);
 ctx.lineTo(40, 10);
 ctx.lineTo(10, 10);
+
 ok(ctx.isPointInPath(5, 5) === true, "ctx.isPointInPath(5, 5) === true");
 ok(ctx.isPointInPath(25, 5) === true, "ctx.isPointInPath(25, 5) === true");
 ok(ctx.isPointInPath(45, 5) === true, "ctx.isPointInPath(45, 5) === true");
@@ -34,7 +36,8 @@ ok(ctx.isPointInPath(5, 45) === true, "ctx.isPointInPath(5, 45) === true");
 ok(ctx.isPointInPath(25, 45) === true, "ctx.isPointInPath(25, 45) === true");
 ok(ctx.isPointInPath(45, 45) === true, "ctx.isPointInPath(45, 45) === true");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.lineTo.basic.html b/content/canvas/test/test_2d.path.lineTo.basic.html
index fa729416a417..34a27c5bec94 100644
--- a/content/canvas/test/test_2d.path.lineTo.basic.html
+++ b/content/canvas/test/test_2d.path.lineTo.basic.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.lineTo.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.lineTo(100, 25);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.lineTo.emptysubpath.html b/content/canvas/test/test_2d.path.lineTo.emptysubpath.html
index edde758bc38d..ccff21e9b1d8 100644
--- a/content/canvas/test/test_2d.path.lineTo.emptysubpath.html
+++ b/content/canvas/test/test_2d.path.lineTo.emptysubpath.html
@@ -2,25 +2,33 @@
 <title>Canvas test: 2d.path.lineTo.emptysubpath</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -37,7 +45,8 @@ ctx.lineTo(100, 25);
 ctx.stroke();
 todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.lineTo.nextpoint.html b/content/canvas/test/test_2d.path.lineTo.nextpoint.html
index 170b661e255e..d15a1b51cd76 100644
--- a/content/canvas/test/test_2d.path.lineTo.nextpoint.html
+++ b/content/canvas/test/test_2d.path.lineTo.nextpoint.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.lineTo.nextpoint</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +34,8 @@ ctx.lineTo(100, 25);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.lineTo.nonfinite.html b/content/canvas/test/test_2d.path.lineTo.nonfinite.html
new file mode 100644
index 000000000000..2bc2371644d1
--- /dev/null
+++ b/content/canvas/test/test_2d.path.lineTo.nonfinite.html
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.lineTo.nonfinite</title>
+<!-- Testing: lineTo() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.lineTo(Infinity, 50);
+ctx.lineTo(-Infinity, 50);
+ctx.lineTo(NaN, 50);
+ctx.lineTo(0, Infinity);
+ctx.lineTo(0, -Infinity);
+ctx.lineTo(0, NaN);
+ctx.lineTo(Infinity, Infinity);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 90,45, 0,255,0,255, "90,45", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.moveTo.basic.html b/content/canvas/test/test_2d.path.moveTo.basic.html
index ed55dc5c7e50..2aaff6068e92 100644
--- a/content/canvas/test/test_2d.path.moveTo.basic.html
+++ b/content/canvas/test/test_2d.path.moveTo.basic.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.moveTo.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +34,8 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 isPixel(ctx, 90,25, 0,255,0,255, "90,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.moveTo.multiple.html b/content/canvas/test/test_2d.path.moveTo.multiple.html
index 0635138ac5a8..617740057531 100644
--- a/content/canvas/test/test_2d.path.moveTo.multiple.html
+++ b/content/canvas/test/test_2d.path.moveTo.multiple.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.moveTo.multiple</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +34,8 @@ ctx.lineWidth = 50;
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.moveTo.newsubpath.html b/content/canvas/test/test_2d.path.moveTo.newsubpath.html
index 0e9cf86e0e8b..bf610307f44d 100644
--- a/content/canvas/test/test_2d.path.moveTo.newsubpath.html
+++ b/content/canvas/test/test_2d.path.moveTo.newsubpath.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.moveTo.newsubpath</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +34,8 @@ ctx.fillStyle = '#f00';
 ctx.fill();
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.moveTo.nonfinite.html b/content/canvas/test/test_2d.path.moveTo.nonfinite.html
new file mode 100644
index 000000000000..55423f01c8d0
--- /dev/null
+++ b/content/canvas/test/test_2d.path.moveTo.nonfinite.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.moveTo.nonfinite</title>
+<!-- Testing: moveTo() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.moveTo(Infinity, 50);
+ctx.moveTo(-Infinity, 50);
+ctx.moveTo(NaN, 50);
+ctx.moveTo(0, Infinity);
+ctx.moveTo(0, -Infinity);
+ctx.moveTo(0, NaN);
+ctx.moveTo(Infinity, Infinity);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.quadraticCurveTo.basic.html b/content/canvas/test/test_2d.path.quadraticCurveTo.basic.html
index bb46f7840b14..ad4a7cda4831 100644
--- a/content/canvas/test/test_2d.path.quadraticCurveTo.basic.html
+++ b/content/canvas/test/test_2d.path.quadraticCurveTo.basic.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.quadraticCurveTo.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +33,8 @@ ctx.quadraticCurveTo(100, 25, 100, 25);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.quadraticCurveTo.emptysubpath.html b/content/canvas/test/test_2d.path.quadraticCurveTo.emptysubpath.html
index 93abadda4fa1..fb06e71e74a7 100644
--- a/content/canvas/test/test_2d.path.quadraticCurveTo.emptysubpath.html
+++ b/content/canvas/test/test_2d.path.quadraticCurveTo.emptysubpath.html
@@ -2,25 +2,33 @@
 <title>Canvas test: 2d.path.quadraticCurveTo.emptysubpath</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -37,7 +45,8 @@ ctx.quadraticCurveTo(100, 25, 100, 25);
 ctx.stroke();
 todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.quadraticCurveTo.nonfinite.html b/content/canvas/test/test_2d.path.quadraticCurveTo.nonfinite.html
new file mode 100644
index 000000000000..3c5d364237a0
--- /dev/null
+++ b/content/canvas/test/test_2d.path.quadraticCurveTo.nonfinite.html
@@ -0,0 +1,73 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.quadraticCurveTo.nonfinite</title>
+<!-- Testing: quadraticCurveTo() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.quadraticCurveTo(Infinity, 50, 0, 50);
+ctx.quadraticCurveTo(-Infinity, 50, 0, 50);
+ctx.quadraticCurveTo(NaN, 50, 0, 50);
+ctx.quadraticCurveTo(0, Infinity, 0, 50);
+ctx.quadraticCurveTo(0, -Infinity, 0, 50);
+ctx.quadraticCurveTo(0, NaN, 0, 50);
+ctx.quadraticCurveTo(0, 50, Infinity, 50);
+ctx.quadraticCurveTo(0, 50, -Infinity, 50);
+ctx.quadraticCurveTo(0, 50, NaN, 50);
+ctx.quadraticCurveTo(0, 50, 0, Infinity);
+ctx.quadraticCurveTo(0, 50, 0, -Infinity);
+ctx.quadraticCurveTo(0, 50, 0, NaN);
+ctx.quadraticCurveTo(Infinity, Infinity, 0, 50);
+ctx.quadraticCurveTo(Infinity, Infinity, Infinity, 50);
+ctx.quadraticCurveTo(Infinity, Infinity, Infinity, Infinity);
+ctx.quadraticCurveTo(Infinity, Infinity, 0, Infinity);
+ctx.quadraticCurveTo(Infinity, 50, Infinity, 50);
+ctx.quadraticCurveTo(Infinity, 50, Infinity, Infinity);
+ctx.quadraticCurveTo(Infinity, 50, 0, Infinity);
+ctx.quadraticCurveTo(0, Infinity, Infinity, 50);
+ctx.quadraticCurveTo(0, Infinity, Infinity, Infinity);
+ctx.quadraticCurveTo(0, Infinity, 0, Infinity);
+ctx.quadraticCurveTo(0, 50, Infinity, Infinity);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 90,45, 0,255,0,255, "90,45", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.quadraticCurveTo.scaled.html b/content/canvas/test/test_2d.path.quadraticCurveTo.scaled.html
index 2731a0bde0f3..42d1e485ba98 100644
--- a/content/canvas/test/test_2d.path.quadraticCurveTo.scaled.html
+++ b/content/canvas/test/test_2d.path.quadraticCurveTo.scaled.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.quadraticCurveTo.scaled</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -39,7 +38,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.quadraticCurveTo.shape.html b/content/canvas/test/test_2d.path.quadraticCurveTo.shape.html
index 8aee724facc1..65382c4c0d00 100644
--- a/content/canvas/test/test_2d.path.quadraticCurveTo.shape.html
+++ b/content/canvas/test/test_2d.path.quadraticCurveTo.shape.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.quadraticCurveTo.shape</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -38,7 +37,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.rect.basic.html b/content/canvas/test/test_2d.path.rect.basic.html
index 1c072a79246f..779df07a9c5f 100644
--- a/content/canvas/test/test_2d.path.rect.basic.html
+++ b/content/canvas/test/test_2d.path.rect.basic.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.rect.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -31,7 +30,8 @@ ctx.rect(0, 0, 100, 50);
 ctx.fill();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.rect.closed.html b/content/canvas/test/test_2d.path.rect.closed.html
index 5ab80207607d..a11511a46f5b 100644
--- a/content/canvas/test/test_2d.path.rect.closed.html
+++ b/content/canvas/test/test_2d.path.rect.closed.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.rect.closed</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.rect(100, 50, 100, 100);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.rect.end.1.html b/content/canvas/test/test_2d.path.rect.end.1.html
index ebd372d6ea75..05d2ca1bb502 100644
--- a/content/canvas/test/test_2d.path.rect.end.1.html
+++ b/content/canvas/test/test_2d.path.rect.end.1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.rect.end.1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.lineTo(-2000, -1000);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.rect.end.2.html b/content/canvas/test/test_2d.path.rect.end.2.html
index 282db9417934..2d54c92fb0e9 100644
--- a/content/canvas/test/test_2d.path.rect.end.2.html
+++ b/content/canvas/test/test_2d.path.rect.end.2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.rect.end.2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -38,7 +37,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.rect.negative.html b/content/canvas/test/test_2d.path.rect.negative.html
index 14537e2d6df9..47d67974aa57 100644
--- a/content/canvas/test/test_2d.path.rect.negative.html
+++ b/content/canvas/test/test_2d.path.rect.negative.html
@@ -2,11 +2,22 @@
 <title>Canvas test: 2d.path.rect.negative</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,17 +25,22 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-var _thrown = undefined; try {
-  ctx.rect(0, 0, -1, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-var _thrown = undefined; try {
-  ctx.rect(0, 0, 10, -1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-var _thrown = undefined; try {
-  ctx.rect(0, 0, -1, -1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.beginPath();
+ctx.fillStyle = '#0f0';
+ctx.rect(0, 0, 50, 25);
+ctx.rect(100, 0, -50, 25);
+ctx.rect(0, 50, 50, -25);
+ctx.rect(100, 50, -50, -25);
+ctx.fill();
+isPixel(ctx, 25,12, 0,255,0,255, "25,12", "0,255,0,255", 0);
+isPixel(ctx, 75,12, 0,255,0,255, "75,12", "0,255,0,255", 0);
+isPixel(ctx, 25,37, 0,255,0,255, "25,37", "0,255,0,255", 0);
+isPixel(ctx, 75,37, 0,255,0,255, "75,37", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.rect.newsubpath.html b/content/canvas/test/test_2d.path.rect.newsubpath.html
index ea34382feb2b..eb57814ffffc 100644
--- a/content/canvas/test/test_2d.path.rect.newsubpath.html
+++ b/content/canvas/test/test_2d.path.rect.newsubpath.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.rect.newsubpath</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +34,8 @@ ctx.rect(200, 25, 1, 1);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.rect.nonfinite.html b/content/canvas/test/test_2d.path.rect.nonfinite.html
new file mode 100644
index 000000000000..52cd17f3f413
--- /dev/null
+++ b/content/canvas/test/test_2d.path.rect.nonfinite.html
@@ -0,0 +1,73 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.rect.nonfinite</title>
+<!-- Testing: rect() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.rect(Infinity, 50, 1, 1);
+ctx.rect(-Infinity, 50, 1, 1);
+ctx.rect(NaN, 50, 1, 1);
+ctx.rect(0, Infinity, 1, 1);
+ctx.rect(0, -Infinity, 1, 1);
+ctx.rect(0, NaN, 1, 1);
+ctx.rect(0, 50, Infinity, 1);
+ctx.rect(0, 50, -Infinity, 1);
+ctx.rect(0, 50, NaN, 1);
+ctx.rect(0, 50, 1, Infinity);
+ctx.rect(0, 50, 1, -Infinity);
+ctx.rect(0, 50, 1, NaN);
+ctx.rect(Infinity, Infinity, 1, 1);
+ctx.rect(Infinity, Infinity, Infinity, 1);
+ctx.rect(Infinity, Infinity, Infinity, Infinity);
+ctx.rect(Infinity, Infinity, 1, Infinity);
+ctx.rect(Infinity, 50, Infinity, 1);
+ctx.rect(Infinity, 50, Infinity, Infinity);
+ctx.rect(Infinity, 50, 1, Infinity);
+ctx.rect(0, Infinity, Infinity, 1);
+ctx.rect(0, Infinity, Infinity, Infinity);
+ctx.rect(0, Infinity, 1, Infinity);
+ctx.rect(0, 50, Infinity, Infinity);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 90,45, 0,255,0,255, "90,45", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.rect.selfintersect.html b/content/canvas/test/test_2d.path.rect.selfintersect.html
index 3e2290da500c..3978294c661c 100644
--- a/content/canvas/test/test_2d.path.rect.selfintersect.html
+++ b/content/canvas/test/test_2d.path.rect.selfintersect.html
@@ -2,18 +2,29 @@
 <title>Canvas test: 2d.path.rect.selfintersect</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +44,8 @@ ctx.rect(45, 20, 10, 10);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.rect.winding.html b/content/canvas/test/test_2d.path.rect.winding.html
new file mode 100644
index 000000000000..4abef7a57a27
--- /dev/null
+++ b/content/canvas/test/test_2d.path.rect.winding.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.rect.winding</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.beginPath();
+ctx.fillStyle = '#f00';
+ctx.rect(0, 0, 50, 50);
+ctx.rect(100, 50, -50, -50);
+ctx.rect(0, 25, 100, -25);
+ctx.rect(100, 25, -100, 25);
+ctx.fill();
+isPixel(ctx, 25,12, 0,255,0,255, "25,12", "0,255,0,255", 0);
+isPixel(ctx, 75,12, 0,255,0,255, "75,12", "0,255,0,255", 0);
+isPixel(ctx, 25,37, 0,255,0,255, "25,37", "0,255,0,255", 0);
+isPixel(ctx, 75,37, 0,255,0,255, "75,37", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.rect.zero.1.html b/content/canvas/test/test_2d.path.rect.zero.1.html
index 7f70648fcd8f..cb940cf613e9 100644
--- a/content/canvas/test/test_2d.path.rect.zero.1.html
+++ b/content/canvas/test/test_2d.path.rect.zero.1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.rect.zero.1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.rect(0, 50, 100, 0);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.rect.zero.2.html b/content/canvas/test/test_2d.path.rect.zero.2.html
index 9f33e2cecb29..08fd5e871ee3 100644
--- a/content/canvas/test/test_2d.path.rect.zero.2.html
+++ b/content/canvas/test/test_2d.path.rect.zero.2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.rect.zero.2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.rect(50, -100, 0, 250);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.rect.zero.3.html b/content/canvas/test/test_2d.path.rect.zero.3.html
index 61b46fb9e441..2a82cac3caf4 100644
--- a/content/canvas/test/test_2d.path.rect.zero.3.html
+++ b/content/canvas/test/test_2d.path.rect.zero.3.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.rect.zero.3</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.rect(50, 25, 0, 0);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.rect.zero.4.html b/content/canvas/test/test_2d.path.rect.zero.4.html
index 07d523c3c8c6..2c4ee83b6bec 100644
--- a/content/canvas/test/test_2d.path.rect.zero.4.html
+++ b/content/canvas/test/test_2d.path.rect.zero.4.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.rect.zero.4</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.lineTo(0, 25);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.rect.zero.5.html b/content/canvas/test/test_2d.path.rect.zero.5.html
index 9f94b3dee2e2..3b6f3ebde6eb 100644
--- a/content/canvas/test/test_2d.path.rect.zero.5.html
+++ b/content/canvas/test/test_2d.path.rect.zero.5.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.path.rect.zero.5</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.rect(100, 25, 0, 0);
 ctx.stroke();
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.rect.zero.6.html b/content/canvas/test/test_2d.path.rect.zero.6.html
index beefc06b529c..28f520c3a9f8 100644
--- a/content/canvas/test/test_2d.path.rect.zero.6.html
+++ b/content/canvas/test/test_2d.path.rect.zero.6.html
@@ -2,18 +2,29 @@
 <title>Canvas test: 2d.path.rect.zero.6</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,9 +44,10 @@ ctx.lineWidth = 200;
 ctx.beginPath();
 ctx.rect(100, 25, 1000, 0);
 ctx.stroke();
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
+todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.stroke.empty.html b/content/canvas/test/test_2d.path.stroke.empty.html
new file mode 100644
index 000000000000..37cfcc1423b1
--- /dev/null
+++ b/content/canvas/test/test_2d.path.stroke.empty.html
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.stroke.empty</title>
+<!-- Testing: Empty subpaths are not stroked -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.lineCap = 'round';
+ctx.lineJoin = 'round';
+
+ctx.beginPath();
+ctx.moveTo(40, 25);
+ctx.moveTo(60, 25);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.stroke.overlap.html b/content/canvas/test/test_2d.path.stroke.overlap.html
new file mode 100644
index 000000000000..62664f899d7e
--- /dev/null
+++ b/content/canvas/test/test_2d.path.stroke.overlap.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.stroke.overlap</title>
+<!-- Testing: Stroked subpaths are combined before being drawn -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#000';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.lineWidth = 50;
+ctx.moveTo(0, 20);
+ctx.lineTo(100, 20);
+ctx.moveTo(0, 30);
+ctx.lineTo(100, 30);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.stroke.prune.arc.html b/content/canvas/test/test_2d.path.stroke.prune.arc.html
new file mode 100644
index 000000000000..2b6b78f4a387
--- /dev/null
+++ b/content/canvas/test/test_2d.path.stroke.prune.arc.html
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.stroke.prune.arc</title>
+<!-- Testing: Zero-length line segments from arcTo and arc are removed before stroking -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.lineCap = 'round';
+ctx.lineJoin = 'round';
+
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.arcTo(50, 25, 150, 25, 10);
+ctx.stroke();
+
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.arc(50, 25, 10, 0, 0, false);
+ctx.stroke();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.stroke.prune.closed.html b/content/canvas/test/test_2d.path.stroke.prune.closed.html
new file mode 100644
index 000000000000..37a92c29d39b
--- /dev/null
+++ b/content/canvas/test/test_2d.path.stroke.prune.closed.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.stroke.prune.closed</title>
+<!-- Testing: Zero-length line segments from closed paths are removed before stroking -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.lineCap = 'round';
+ctx.lineJoin = 'round';
+
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.lineTo(50, 25);
+ctx.closePath();
+ctx.stroke();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.stroke.prune.corner.html b/content/canvas/test/test_2d.path.stroke.prune.corner.html
new file mode 100644
index 000000000000..d93ecf8acb01
--- /dev/null
+++ b/content/canvas/test/test_2d.path.stroke.prune.corner.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.stroke.prune.corner</title>
+<!-- Testing: Zero-length line segments are removed before stroking with miters -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 400;
+ctx.lineJoin = 'miter';
+ctx.miterLimit = 1.4;
+
+ctx.beginPath();
+ctx.moveTo(-1000, 200, 0, 0);
+ctx.lineTo(-100, 200);
+ctx.lineTo(-100, 200);
+ctx.lineTo(-100, 200);
+ctx.lineTo(-100, 1000);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.stroke.prune.curve.html b/content/canvas/test/test_2d.path.stroke.prune.curve.html
new file mode 100644
index 000000000000..e0a3e9a73f2b
--- /dev/null
+++ b/content/canvas/test/test_2d.path.stroke.prune.curve.html
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.stroke.prune.curve</title>
+<!-- Testing: Zero-length line segments from quadraticCurveTo and bezierCurveTo are removed before stroking -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.lineCap = 'round';
+ctx.lineJoin = 'round';
+
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.quadraticCurveTo(50, 25, 50, 25);
+ctx.stroke();
+
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.bezierCurveTo(50, 25, 50, 25, 50, 25);
+ctx.stroke();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.line.cap.zeroline.round.html b/content/canvas/test/test_2d.path.stroke.prune.line.html
similarity index 55%
rename from content/canvas/test/test_2d.line.cap.zeroline.round.html
rename to content/canvas/test/test_2d.path.stroke.prune.line.html
index 681e3e4840ce..83d9ae12ec5f 100644
--- a/content/canvas/test/test_2d.line.cap.zeroline.round.html
+++ b/content/canvas/test/test_2d.path.stroke.prune.line.html
@@ -1,26 +1,35 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.cap.zeroline.round</title>
+<title>Canvas test: 2d.path.stroke.prune.line</title>
+<!-- Testing: Zero-length line segments from lineTo are removed before stroking -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -33,20 +42,19 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
 ctx.strokeStyle = '#f00';
-ctx.lineWidth = 150;
+ctx.lineWidth = 100;
 ctx.lineCap = 'round';
+ctx.lineJoin = 'round';
 
 ctx.beginPath();
 ctx.moveTo(50, 25);
 ctx.lineTo(50, 25);
 ctx.stroke();
 
-todo_isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-todo_isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
-todo_isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
-todo_isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.stroke.prune.rect.html b/content/canvas/test/test_2d.path.stroke.prune.rect.html
new file mode 100644
index 000000000000..19ab96c744fe
--- /dev/null
+++ b/content/canvas/test/test_2d.path.stroke.prune.rect.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.stroke.prune.rect</title>
+<!-- Testing: Zero-length line segments from rect and strokeRect are removed before stroking -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.lineCap = 'round';
+ctx.lineJoin = 'round';
+
+ctx.beginPath();
+ctx.rect(50, 25, 0, 0);
+ctx.stroke();
+
+ctx.strokeRect(50, 25, 0, 0);
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.stroke.scale1.html b/content/canvas/test/test_2d.path.stroke.scale1.html
new file mode 100644
index 000000000000..c05ee6661c09
--- /dev/null
+++ b/content/canvas/test/test_2d.path.stroke.scale1.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.stroke.scale1</title>
+<!-- Testing: Stroke line widths are scaled by the current transformation matrix -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(25, 12.5, 50, 25);
+ctx.save();
+ctx.scale(50, 25);
+ctx.strokeStyle = '#0f0';
+ctx.stroke();
+ctx.restore();
+
+ctx.beginPath();
+ctx.rect(-25, -12.5, 150, 75);
+ctx.save();
+ctx.scale(50, 25);
+ctx.strokeStyle = '#f00';
+ctx.stroke();
+ctx.restore();
+
+isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 0);
+isPixel(ctx, 50,0, 0,255,0,255, "50,0", "0,255,0,255", 0);
+isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 0);
+isPixel(ctx, 0,25, 0,255,0,255, "0,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 99,25, 0,255,0,255, "99,25", "0,255,0,255", 0);
+isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 0);
+isPixel(ctx, 50,49, 0,255,0,255, "50,49", "0,255,0,255", 0);
+isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.stroke.scale2.html b/content/canvas/test/test_2d.path.stroke.scale2.html
new file mode 100644
index 000000000000..09470653c3aa
--- /dev/null
+++ b/content/canvas/test/test_2d.path.stroke.scale2.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.stroke.scale2</title>
+<!-- Testing: Stroke line widths are scaled by the current transformation matrix -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(25, 12.5, 50, 25);
+ctx.save();
+ctx.rotate(Math.PI/2);
+ctx.scale(25, 50);
+ctx.strokeStyle = '#0f0';
+ctx.stroke();
+ctx.restore();
+
+ctx.beginPath();
+ctx.rect(-25, -12.5, 150, 75);
+ctx.save();
+ctx.rotate(Math.PI/2);
+ctx.scale(25, 50);
+ctx.strokeStyle = '#f00';
+ctx.stroke();
+ctx.restore();
+
+isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 0);
+isPixel(ctx, 50,0, 0,255,0,255, "50,0", "0,255,0,255", 0);
+isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 0);
+isPixel(ctx, 0,25, 0,255,0,255, "0,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 99,25, 0,255,0,255, "99,25", "0,255,0,255", 0);
+isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 0);
+isPixel(ctx, 50,49, 0,255,0,255, "50,49", "0,255,0,255", 0);
+isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.stroke.skew.html b/content/canvas/test/test_2d.path.stroke.skew.html
new file mode 100644
index 000000000000..269e00d21314
--- /dev/null
+++ b/content/canvas/test/test_2d.path.stroke.skew.html
@@ -0,0 +1,78 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.stroke.skew</title>
+<!-- Testing: Strokes lines are skewed by the current transformation matrix -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.save();
+ctx.beginPath();
+ctx.moveTo(49, -50);
+ctx.lineTo(201, -50);
+ctx.rotate(Math.PI/4);
+ctx.scale(1, 283);
+ctx.strokeStyle = '#0f0';
+ctx.stroke();
+ctx.restore();
+
+ctx.save();
+ctx.beginPath();
+ctx.translate(-150, 0);
+ctx.moveTo(49, -50);
+ctx.lineTo(199, -50);
+ctx.rotate(Math.PI/4);
+ctx.scale(1, 142);
+ctx.strokeStyle = '#f00';
+ctx.stroke();
+ctx.restore();
+
+ctx.save();
+ctx.beginPath();
+ctx.translate(-150, 0);
+ctx.moveTo(49, -50);
+ctx.lineTo(199, -50);
+ctx.rotate(Math.PI/4);
+ctx.scale(1, 142);
+ctx.strokeStyle = '#f00';
+ctx.stroke();
+ctx.restore();
+
+isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 0);
+isPixel(ctx, 50,0, 0,255,0,255, "50,0", "0,255,0,255", 0);
+isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 0);
+isPixel(ctx, 0,25, 0,255,0,255, "0,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 99,25, 0,255,0,255, "99,25", "0,255,0,255", 0);
+isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 0);
+isPixel(ctx, 50,49, 0,255,0,255, "50,49", "0,255,0,255", 0);
+isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.stroke.unaffected.html b/content/canvas/test/test_2d.path.stroke.unaffected.html
index 957b64d46de4..a5d4166c8dc8 100644
--- a/content/canvas/test/test_2d.path.stroke.unaffected.html
+++ b/content/canvas/test/test_2d.path.stroke.unaffected.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.stroke.unaffected</title>
+<!-- Testing: Stroking does not start a new path or subpath -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -43,7 +43,8 @@ ctx.stroke();
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.stroke.union.html b/content/canvas/test/test_2d.path.stroke.union.html
index 97962da92767..39d592c08f80 100644
--- a/content/canvas/test/test_2d.path.stroke.union.html
+++ b/content/canvas/test/test_2d.path.stroke.union.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.path.stroke.union</title>
+<!-- Testing: Strokes in opposite directions are unioned, not subtracted -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -39,7 +39,8 @@ ctx.stroke();
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.transformation.basic.html b/content/canvas/test/test_2d.path.transformation.basic.html
index f475dcb556d1..cc3875de02db 100644
--- a/content/canvas/test/test_2d.path.transformation.basic.html
+++ b/content/canvas/test/test_2d.path.transformation.basic.html
@@ -2,26 +2,22 @@
 <title>Canvas test: 2d.path.transformation.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
-}
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -32,14 +28,16 @@ var ctx = canvas.getContext('2d');
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 
-ctx.rect(100, 0, 100, 50);
 ctx.translate(-100, 0);
+ctx.rect(100, 0, 100, 50);
+ctx.translate(0, -100);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.transformation.changing.html b/content/canvas/test/test_2d.path.transformation.changing.html
new file mode 100644
index 000000000000..6ca746b0c435
--- /dev/null
+++ b/content/canvas/test/test_2d.path.transformation.changing.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.transformation.changing</title>
+<!-- Testing: Transformations are applied while building paths, not when drawing -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.moveTo(0, 0);
+ctx.translate(100, 0);
+ctx.lineTo(0, 0);
+ctx.translate(0, 50);
+ctx.lineTo(0, 0);
+ctx.translate(-100, 0);
+ctx.lineTo(0, 0);
+ctx.translate(1000, 1000);
+ctx.rotate(Math.PI/2);
+ctx.scale(0.1, 0.1);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.path.transformation.multiple.2.html b/content/canvas/test/test_2d.path.transformation.multiple.html
similarity index 64%
rename from content/canvas/test/test_2d.path.transformation.multiple.2.html
rename to content/canvas/test/test_2d.path.transformation.multiple.html
index 0584ee8efc3b..0f9b4edb9cb7 100644
--- a/content/canvas/test/test_2d.path.transformation.multiple.2.html
+++ b/content/canvas/test/test_2d.path.transformation.multiple.html
@@ -1,27 +1,23 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.path.transformation.multiple.2</title>
+<title>Canvas test: 2d.path.transformation.multiple</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
-}
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -32,16 +28,16 @@ var ctx = canvas.getContext('2d');
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 
-ctx.fillStyle = '#0f0';
 ctx.rect(0, 0, 100, 50);
 ctx.fill();
 ctx.translate(-100, 0);
-ctx.fillStyle = '#f00';
+ctx.fillStyle = '#0f0';
 ctx.fill();
 
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.pattern.animated.gif.html b/content/canvas/test/test_2d.pattern.animated.gif.html
new file mode 100644
index 000000000000..c951a650a2cc
--- /dev/null
+++ b/content/canvas/test/test_2d.pattern.animated.gif.html
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.pattern.animated.gif</title>
+<!-- Testing: createPattern() of an animated GIF draws the first frame -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function deferTest() {
+    _deferred = true;
+}
+function wrapFunction(f) {
+    return function () {
+        f.apply(null, arguments);
+        SimpleTest.finish();
+    }
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+deferTest();
+setTimeout(function () {
+    var pattern = ctx.createPattern(document.getElementById('anim-gr.gif'), 'repeat');
+    ctx.fillStyle = pattern;
+    ctx.fillRect(0, 0, 50, 50);
+    setTimeout(wrapFunction(function () {
+        ctx.fillRect(50, 0, 50, 50);
+        todo_isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
+        todo_isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
+    }), 250);
+}, 250);
+
+
+});
+</script>
+<img src="image_anim-gr.gif" id="anim-gr.gif" class="resource">
+
diff --git a/content/canvas/test/test_2d.pattern.basic.canvas.html b/content/canvas/test/test_2d.pattern.basic.canvas.html
index 35d7313cecc1..6d0d24eca723 100644
--- a/content/canvas/test/test_2d.pattern.basic.canvas.html
+++ b/content/canvas/test/test_2d.pattern.basic.canvas.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.basic.canvas</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -50,7 +49,8 @@ isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.pattern.basic.image.html b/content/canvas/test/test_2d.pattern.basic.image.html
index 71e370b71ddf..cdf3e5f83755 100644
--- a/content/canvas/test/test_2d.pattern.basic.image.html
+++ b/content/canvas/test/test_2d.pattern.basic.image.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.basic.image</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -38,7 +37,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_green.png" id="green.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.basic.nocontext.html b/content/canvas/test/test_2d.pattern.basic.nocontext.html
index f779b53883fb..441728c89d7e 100644
--- a/content/canvas/test/test_2d.pattern.basic.nocontext.html
+++ b/content/canvas/test/test_2d.pattern.basic.nocontext.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.basic.nocontext</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -41,7 +40,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.pattern.basic.type.html b/content/canvas/test/test_2d.pattern.basic.type.html
index e928a09af2ea..e6db0c7c22e2 100644
--- a/content/canvas/test/test_2d.pattern.basic.type.html
+++ b/content/canvas/test/test_2d.pattern.basic.type.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.pattern.basic.type</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,11 +13,16 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
+ok(window.CanvasPattern !== undefined, "window.CanvasPattern !== undefined");
+
+window.CanvasPattern.prototype.thisImplementsCanvasPattern = true;
+
 var img = document.getElementById('green.png');
 var pattern = ctx.createPattern(img, 'no-repeat');
-ok(Object.prototype.toString.call(pattern) === '[object CanvasPattern]', "Object.prototype.toString.call(pattern) === '[object CanvasPattern]'");
+ok(pattern.thisImplementsCanvasPattern, "pattern.thisImplementsCanvasPattern");
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 <img src="image_green.png" id="green.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.basic.zerocanvas.html b/content/canvas/test/test_2d.pattern.basic.zerocanvas.html
new file mode 100644
index 000000000000..2f818dadef6a
--- /dev/null
+++ b/content/canvas/test/test_2d.pattern.basic.zerocanvas.html
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.pattern.basic.zerocanvas</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 0;
+canvas2.height = 0;
+ok(canvas2.width === 0, "canvas2.width === 0");
+ok(canvas2.height === 0, "canvas2.height === 0");
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#f00';
+ctx2.fillRect(0, 0, 100, 50);
+var pattern = ctx.createPattern(canvas2, 'repeat');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+todo_isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+todo_isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+todo_isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.pattern.crosscanvas.html b/content/canvas/test/test_2d.pattern.crosscanvas.html
index ab22fbf577e7..68a7ac0b26db 100644
--- a/content/canvas/test/test_2d.pattern.crosscanvas.html
+++ b/content/canvas/test/test_2d.pattern.crosscanvas.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.crosscanvas</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -36,7 +35,8 @@ ctx.fillRect(0, 0, 100, 50);
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_green.png" id="green.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.image.broken.html b/content/canvas/test/test_2d.pattern.image.broken.html
index 842e64e5232b..2f21f2700447 100644
--- a/content/canvas/test/test_2d.pattern.image.broken.html
+++ b/content/canvas/test/test_2d.pattern.image.broken.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.pattern.image.broken</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -20,7 +19,8 @@ var _thrown = undefined; try {
   ctx.createPattern(img, 'repeat');
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INVALID_STATE_ERR, "should throw INVALID_STATE_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_broken.png" id="broken.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.image.incomplete.html b/content/canvas/test/test_2d.pattern.image.incomplete.html
index 5d2b6fddde72..607009a37eb3 100644
--- a/content/canvas/test/test_2d.pattern.image.incomplete.html
+++ b/content/canvas/test/test_2d.pattern.image.incomplete.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.pattern.image.incomplete</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -20,7 +19,8 @@ var _thrown = undefined; try {
   ctx.createPattern(img, 'repeat');
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INVALID_STATE_ERR, "should throw INVALID_STATE_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.pattern.image.null.html b/content/canvas/test/test_2d.pattern.image.null.html
index eadc2f73a902..1cced95a655e 100644
--- a/content/canvas/test/test_2d.pattern.image.null.html
+++ b/content/canvas/test/test_2d.pattern.image.null.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.pattern.image.null</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -18,7 +17,8 @@ var _thrown = undefined; try {
   ctx.createPattern(null, 'repeat');
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.pattern.image.string.html b/content/canvas/test/test_2d.pattern.image.string.html
index dd74225d1c55..324cd78af082 100644
--- a/content/canvas/test/test_2d.pattern.image.string.html
+++ b/content/canvas/test/test_2d.pattern.image.string.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.pattern.image.string</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -15,10 +14,11 @@ var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
 var _thrown = undefined; try {
-  ctx.createPattern('image_green.png', 'repeat');
+  ctx.createPattern('image_red.png', 'repeat');
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.pattern.image.undefined.html b/content/canvas/test/test_2d.pattern.image.undefined.html
index 7ad95e2bf631..e14f3ed81f7b 100644
--- a/content/canvas/test/test_2d.pattern.image.undefined.html
+++ b/content/canvas/test/test_2d.pattern.image.undefined.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.pattern.image.undefined</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -18,7 +17,8 @@ var _thrown = undefined; try {
   ctx.createPattern(undefined, 'repeat');
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.pattern.modify.canvas1.html b/content/canvas/test/test_2d.pattern.modify.canvas1.html
index fa379ba1911e..6ce7beb44181 100644
--- a/content/canvas/test/test_2d.pattern.modify.canvas1.html
+++ b/content/canvas/test/test_2d.pattern.modify.canvas1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.modify.canvas1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -46,7 +45,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.pattern.modify.canvas2.html b/content/canvas/test/test_2d.pattern.modify.canvas2.html
index 1000ba21174b..d83b42462b0e 100644
--- a/content/canvas/test/test_2d.pattern.modify.canvas2.html
+++ b/content/canvas/test/test_2d.pattern.modify.canvas2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.modify.canvas2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -50,7 +49,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.pattern.modify.image1.html b/content/canvas/test/test_2d.pattern.modify.image1.html
index 2ed789fa116c..f3f9f0440aec 100644
--- a/content/canvas/test/test_2d.pattern.modify.image1.html
+++ b/content/canvas/test/test_2d.pattern.modify.image1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.modify.image1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -50,7 +49,7 @@ img.onload = wrapFunction(function ()
 });
 img.src = 'image_red.png';
 
-if (!_deferred) SimpleTest.finish();
+
 });
 </script>
 <img src="image_green.png" id="green.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.modify.image2.html b/content/canvas/test/test_2d.pattern.modify.image2.html
index 3d3c20d73e81..2603aa57faa0 100644
--- a/content/canvas/test/test_2d.pattern.modify.image2.html
+++ b/content/canvas/test/test_2d.pattern.modify.image2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.modify.image2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -54,7 +53,7 @@ img.onload = wrapFunction(function ()
 });
 img.src = 'image_red.png';
 
-if (!_deferred) SimpleTest.finish();
+
 });
 </script>
 <img src="image_green.png" id="green.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.norepeat.basic.html b/content/canvas/test/test_2d.pattern.paint.norepeat.basic.html
index 7a316feb41cb..982fa3222230 100644
--- a/content/canvas/test/test_2d.pattern.paint.norepeat.basic.html
+++ b/content/canvas/test/test_2d.pattern.paint.norepeat.basic.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.paint.norepeat.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -39,7 +38,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_green.png" id="green.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.norepeat.coord1.html b/content/canvas/test/test_2d.pattern.paint.norepeat.coord1.html
index cf326b1848b3..8fe578a37daa 100644
--- a/content/canvas/test/test_2d.pattern.paint.norepeat.coord1.html
+++ b/content/canvas/test/test_2d.pattern.paint.norepeat.coord1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.paint.norepeat.coord1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -42,7 +41,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_green.png" id="green.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.norepeat.coord2.html b/content/canvas/test/test_2d.pattern.paint.norepeat.coord2.html
index b054fd7b0187..cf354e88d549 100644
--- a/content/canvas/test/test_2d.pattern.paint.norepeat.coord2.html
+++ b/content/canvas/test/test_2d.pattern.paint.norepeat.coord2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.paint.norepeat.coord2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -43,7 +42,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_green.png" id="green.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.coord3.html b/content/canvas/test/test_2d.pattern.paint.norepeat.coord3.html
similarity index 82%
rename from content/canvas/test/test_2d.pattern.paint.coord3.html
rename to content/canvas/test/test_2d.pattern.paint.norepeat.coord3.html
index b8680d484e18..b03e631e8931 100644
--- a/content/canvas/test/test_2d.pattern.paint.coord3.html
+++ b/content/canvas/test/test_2d.pattern.paint.norepeat.coord3.html
@@ -1,19 +1,18 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.coord3</title>
+<title>Canvas test: 2d.pattern.paint.norepeat.coord3</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -43,7 +42,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red.png" id="red.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.norepeat.outside.html b/content/canvas/test/test_2d.pattern.paint.norepeat.outside.html
index d579b33b00e4..40aa1b11a1b1 100644
--- a/content/canvas/test/test_2d.pattern.paint.norepeat.outside.html
+++ b/content/canvas/test/test_2d.pattern.paint.norepeat.outside.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.paint.norepeat.outside</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -45,7 +44,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red.png" id="red.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.orientation.canvas.html b/content/canvas/test/test_2d.pattern.paint.orientation.canvas.html
new file mode 100644
index 000000000000..16421012aaf4
--- /dev/null
+++ b/content/canvas/test/test_2d.pattern.paint.orientation.canvas.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.pattern.paint.orientation.canvas</title>
+<!-- Testing: Canvas patterns do not get flipped when painted -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#f00';
+ctx2.fillRect(0, 0, 100, 25);
+ctx2.fillStyle = '#0f0';
+ctx2.fillRect(0, 25, 100, 25);
+
+var pattern = ctx.createPattern(canvas2, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 25);
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.pattern.paint.orientation.image.html b/content/canvas/test/test_2d.pattern.paint.orientation.image.html
new file mode 100644
index 000000000000..2916d9d1cfd8
--- /dev/null
+++ b/content/canvas/test/test_2d.pattern.paint.orientation.image.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.pattern.paint.orientation.image</title>
+<!-- Testing: Image patterns do not get flipped when painted -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('rrgg-256x256.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.save();
+ctx.translate(0, -103);
+ctx.fillRect(0, 103, 100, 50);
+ctx.restore();
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 25);
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
+isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_rrgg-256x256.png" id="rrgg-256x256.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.pattern.paint.repeat.basic.html b/content/canvas/test/test_2d.pattern.paint.repeat.basic.html
index 88c624f2e545..3b295671f1cb 100644
--- a/content/canvas/test/test_2d.pattern.paint.repeat.basic.html
+++ b/content/canvas/test/test_2d.pattern.paint.repeat.basic.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.paint.repeat.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -39,7 +38,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_green-16x16.png" id="green-16x16.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.repeat.coord1.html b/content/canvas/test/test_2d.pattern.paint.repeat.coord1.html
index 80815c56697a..702be8b6960c 100644
--- a/content/canvas/test/test_2d.pattern.paint.repeat.coord1.html
+++ b/content/canvas/test/test_2d.pattern.paint.repeat.coord1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.paint.repeat.coord1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -40,7 +39,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_rgrg-256x256.png" id="rgrg-256x256.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.repeat.coord2.html b/content/canvas/test/test_2d.pattern.paint.repeat.coord2.html
index e74a4c987212..13695122d230 100644
--- a/content/canvas/test/test_2d.pattern.paint.repeat.coord2.html
+++ b/content/canvas/test/test_2d.pattern.paint.repeat.coord2.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.paint.repeat.coord2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -36,7 +35,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_ggrr-256x256.png" id="ggrr-256x256.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.repeat.coord3.html b/content/canvas/test/test_2d.pattern.paint.repeat.coord3.html
index 1929bb907eb9..5b14653f9ccc 100644
--- a/content/canvas/test/test_2d.pattern.paint.repeat.coord3.html
+++ b/content/canvas/test/test_2d.pattern.paint.repeat.coord3.html
@@ -2,25 +2,33 @@
 <title>Canvas test: 2d.pattern.paint.repeat.coord3</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -42,7 +50,8 @@ todo_isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 todo_isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 todo_isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_rgrg-256x256.png" id="rgrg-256x256.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.repeat.outside.html b/content/canvas/test/test_2d.pattern.paint.repeat.outside.html
index d0319f7149c2..d243add5df86 100644
--- a/content/canvas/test/test_2d.pattern.paint.repeat.outside.html
+++ b/content/canvas/test/test_2d.pattern.paint.repeat.outside.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.paint.repeat.outside</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -40,7 +39,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_green-16x16.png" id="green-16x16.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.repeatx.basic.html b/content/canvas/test/test_2d.pattern.paint.repeatx.basic.html
index d4fb45f5899a..f9a56f0face3 100644
--- a/content/canvas/test/test_2d.pattern.paint.repeatx.basic.html
+++ b/content/canvas/test/test_2d.pattern.paint.repeatx.basic.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.paint.repeatx.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -41,7 +40,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_green-16x16.png" id="green-16x16.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.repeatx.coord1.html b/content/canvas/test/test_2d.pattern.paint.repeatx.coord1.html
index 560cf01b4bdd..c81f3b23bf47 100644
--- a/content/canvas/test/test_2d.pattern.paint.repeatx.coord1.html
+++ b/content/canvas/test/test_2d.pattern.paint.repeatx.coord1.html
@@ -2,25 +2,33 @@
 <title>Canvas test: 2d.pattern.paint.repeatx.coord1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -48,7 +56,8 @@ isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
 todo_isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 todo_isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red-16x16.png" id="red-16x16.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.repeatx.outside.html b/content/canvas/test/test_2d.pattern.paint.repeatx.outside.html
index 66386af585cd..25d815ac3e75 100644
--- a/content/canvas/test/test_2d.pattern.paint.repeatx.outside.html
+++ b/content/canvas/test/test_2d.pattern.paint.repeatx.outside.html
@@ -2,25 +2,33 @@
 <title>Canvas test: 2d.pattern.paint.repeatx.outside</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -45,7 +53,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 todo_isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 todo_isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red-16x16.png" id="red-16x16.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.repeaty.basic.html b/content/canvas/test/test_2d.pattern.paint.repeaty.basic.html
index 8c3f33e2b1a0..d7f8f9bc887c 100644
--- a/content/canvas/test/test_2d.pattern.paint.repeaty.basic.html
+++ b/content/canvas/test/test_2d.pattern.paint.repeaty.basic.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.paint.repeaty.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -41,7 +40,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_green-16x16.png" id="green-16x16.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.repeaty.coord1.html b/content/canvas/test/test_2d.pattern.paint.repeaty.coord1.html
index d2b7bcd7fe21..6d0e4cce3faf 100644
--- a/content/canvas/test/test_2d.pattern.paint.repeaty.coord1.html
+++ b/content/canvas/test/test_2d.pattern.paint.repeaty.coord1.html
@@ -2,25 +2,33 @@
 <title>Canvas test: 2d.pattern.paint.repeaty.coord1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -48,7 +56,8 @@ todo_isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
 todo_isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red-16x16.png" id="red-16x16.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.paint.repeaty.outside.html b/content/canvas/test/test_2d.pattern.paint.repeaty.outside.html
index 2c80e6ba5c00..7b5df603bfa1 100644
--- a/content/canvas/test/test_2d.pattern.paint.repeaty.outside.html
+++ b/content/canvas/test/test_2d.pattern.paint.repeaty.outside.html
@@ -2,25 +2,33 @@
 <title>Canvas test: 2d.pattern.paint.repeaty.outside</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -45,7 +53,8 @@ todo_isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 todo_isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_red-16x16.png" id="red-16x16.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.repeat.case.html b/content/canvas/test/test_2d.pattern.repeat.case.html
index 8a0b80261a28..41f270e9bb87 100644
--- a/content/canvas/test/test_2d.pattern.repeat.case.html
+++ b/content/canvas/test/test_2d.pattern.repeat.case.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.pattern.repeat.case</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -18,7 +17,8 @@ var _thrown = undefined; try {
   ctx.createPattern(canvas, "Repeat");
 } catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.pattern.repeat.empty.html b/content/canvas/test/test_2d.pattern.repeat.empty.html
index 300fc8bfd3e9..f582a7a9ada9 100644
--- a/content/canvas/test/test_2d.pattern.repeat.empty.html
+++ b/content/canvas/test/test_2d.pattern.repeat.empty.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.repeat.empty</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -38,7 +37,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_green-1x1.png" id="green-1x1.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.repeat.null.html b/content/canvas/test/test_2d.pattern.repeat.null.html
index 69ab1917c4ee..7570b6f464d6 100644
--- a/content/canvas/test/test_2d.pattern.repeat.null.html
+++ b/content/canvas/test/test_2d.pattern.repeat.null.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.pattern.repeat.null</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -38,7 +37,8 @@ isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
 isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
 isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_green-1x1.png" id="green-1x1.png" class="resource">
diff --git a/content/canvas/test/test_2d.pattern.repeat.nullsuffix.html b/content/canvas/test/test_2d.pattern.repeat.nullsuffix.html
index ad1807c9508b..6ddb38a654d2 100644
--- a/content/canvas/test/test_2d.pattern.repeat.nullsuffix.html
+++ b/content/canvas/test/test_2d.pattern.repeat.nullsuffix.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.pattern.repeat.nullsuffix</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -18,7 +17,8 @@ var _thrown = undefined; try {
   ctx.createPattern(canvas, "repeat\0");
 } catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.pattern.repeat.undefined.html b/content/canvas/test/test_2d.pattern.repeat.undefined.html
index adc6c47930e9..f61061b81777 100644
--- a/content/canvas/test/test_2d.pattern.repeat.undefined.html
+++ b/content/canvas/test/test_2d.pattern.repeat.undefined.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.pattern.repeat.undefined</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -18,7 +17,8 @@ var _thrown = undefined; try {
   ctx.createPattern(canvas, undefined);
 } catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.pattern.repeat.unrecognised.html b/content/canvas/test/test_2d.pattern.repeat.unrecognised.html
index eb3dbb5b8ea0..6827092939aa 100644
--- a/content/canvas/test/test_2d.pattern.repeat.unrecognised.html
+++ b/content/canvas/test/test_2d.pattern.repeat.unrecognised.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.pattern.repeat.unrecognised</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -18,7 +17,8 @@ var _thrown = undefined; try {
   ctx.createPattern(canvas, "invalid");
 } catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.scaled.html b/content/canvas/test/test_2d.scaled.html
new file mode 100644
index 000000000000..b5b338d0c7c7
--- /dev/null
+++ b/content/canvas/test/test_2d.scaled.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.scaled</title>
+<!-- Testing: CSS-scaled canvases get drawn correctly -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="50" height="25" style="width: 100px; height: 50px"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#00f';
+ctx.fillRect(0, 0, 50, 25);
+ctx.fillStyle = '#0ff';
+ctx.fillRect(0, 0, 25, 10);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.alpha.1.html b/content/canvas/test/test_2d.shadow.alpha.1.html
new file mode 100644
index 000000000000..d9c5699387fd
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.alpha.1.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.alpha.1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = 'rgba(255, 0, 0, 0.01)';
+ctx.shadowOffsetY = 50;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 4);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.alpha.2.html b/content/canvas/test/test_2d.shadow.alpha.2.html
new file mode 100644
index 000000000000..0de497176cd8
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.alpha.2.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.alpha.2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = 'rgba(0, 0, 255, 0.5)';
+ctx.shadowOffsetY = 50;
+ctx.fillRect(0, -50, 100, 50);
+
+todo_isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.alpha.3.html b/content/canvas/test/test_2d.shadow.alpha.3.html
new file mode 100644
index 000000000000..a25217ba13c2
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.alpha.3.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.alpha.3</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00'; // (work around broken Firefox globalAlpha caching)
+ctx.shadowColor = '#00f';
+ctx.shadowOffsetY = 50;
+ctx.globalAlpha = 0.5;
+ctx.fillRect(0, -50, 100, 50);
+
+todo_isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.alpha.4.html b/content/canvas/test/test_2d.shadow.alpha.4.html
new file mode 100644
index 000000000000..4bca5af75cfc
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.alpha.4.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.alpha.4</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00'; // (work around broken Firefox globalAlpha caching)
+ctx.shadowColor = 'rgba(0, 0, 255, 0.707)';
+ctx.shadowOffsetY = 50;
+ctx.globalAlpha = 0.707;
+ctx.fillRect(0, -50, 100, 50);
+
+todo_isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.alpha.5.html b/content/canvas/test/test_2d.shadow.alpha.5.html
new file mode 100644
index 000000000000..4ef05355d14c
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.alpha.5.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.alpha.5</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = 'rgba(64, 0, 0, 0.5)';
+ctx.shadowColor = '#00f';
+ctx.shadowOffsetY = 50;
+ctx.fillRect(0, -50, 100, 50);
+
+todo_isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.attributes.shadowBlur.1.html b/content/canvas/test/test_2d.shadow.attributes.shadowBlur.1.html
new file mode 100644
index 000000000000..333a5492504e
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.attributes.shadowBlur.1.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.attributes.shadowBlur.1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.shadowBlur = 1;
+todo(ctx.shadowBlur === 1, "ctx.shadowBlur === 1");
+ctx.shadowBlur = 0.5;
+todo(ctx.shadowBlur === 0.5, "ctx.shadowBlur === 0.5");
+ctx.shadowBlur = 1e6;
+todo(ctx.shadowBlur === 1e6, "ctx.shadowBlur === 1e6");
+ctx.shadowBlur = 1;
+ctx.shadowBlur = -2;
+todo(ctx.shadowBlur === 1, "ctx.shadowBlur === 1");
+ctx.shadowBlur = 0;
+ok(ctx.shadowBlur === 0, "ctx.shadowBlur === 0");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.line.invalid.miterLimit.html b/content/canvas/test/test_2d.shadow.attributes.shadowBlur.2.html
similarity index 53%
rename from content/canvas/test/test_2d.line.invalid.miterLimit.html
rename to content/canvas/test/test_2d.shadow.attributes.shadowBlur.2.html
index b14ee773de42..d3dcf92a1305 100644
--- a/content/canvas/test/test_2d.line.invalid.miterLimit.html
+++ b/content/canvas/test/test_2d.shadow.attributes.shadowBlur.2.html
@@ -1,12 +1,11 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.invalid.miterLimit</title>
+<title>Canvas test: 2d.shadow.attributes.shadowBlur.2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,36 +13,18 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-ctx.miterLimit = 1.5;
-ok(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
-
-ctx.miterLimit = 1.5;
-ctx.miterLimit = 0;
-todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
-
-ctx.miterLimit = 1.5;
-ctx.miterLimit = -1;
-todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
-
-ctx.miterLimit = 1.5;
 var _thrown = undefined; try {
-  ctx.miterLimit = Infinity;
+  ctx.shadowBlur = Infinity;
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-ok(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
-
-ctx.miterLimit = 1.5;
 var _thrown = undefined; try {
-  ctx.miterLimit = -Infinity;
+  ctx.shadowBlur = -Infinity;
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-ok(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
-
-ctx.miterLimit = 1.5;
 var _thrown = undefined; try {
-  ctx.miterLimit = NaN;
+  ctx.shadowBlur = NaN;
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-ok(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.path.arc.zero.html b/content/canvas/test/test_2d.shadow.attributes.shadowColor.1.html
similarity index 51%
rename from content/canvas/test/test_2d.path.arc.zero.html
rename to content/canvas/test/test_2d.shadow.attributes.shadowColor.1.html
index ee21f118c89a..99f6ec5b5cb9 100644
--- a/content/canvas/test/test_2d.path.arc.zero.html
+++ b/content/canvas/test/test_2d.shadow.attributes.shadowColor.1.html
@@ -1,12 +1,11 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.zero</title>
+<title>Canvas test: 2d.shadow.attributes.shadowColor.1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,11 +13,13 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-var _thrown = undefined; try {
-  ctx.arc(0, 0, 0, 0, 0, true);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+ctx.shadowColor = 'lime';
+todo(ctx.shadowColor === '#00ff00', "ctx.shadowColor === '#00ff00'");
+ctx.shadowColor = 'RGBA(0,255, 0,0)';
+todo(ctx.shadowColor === 'rgba(0, 255, 0, 0.0)', "ctx.shadowColor === 'rgba(0, 255, 0, 0.0)'");
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.shadow.attributes.shadowColor.2.html b/content/canvas/test/test_2d.shadow.attributes.shadowColor.2.html
new file mode 100644
index 000000000000..138207813787
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.attributes.shadowColor.2.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.attributes.shadowColor.2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.shadowColor = '#00ff00';
+ctx.shadowColor = 'bogus';
+todo(ctx.shadowColor === '#00ff00', "ctx.shadowColor === '#00ff00'");
+ctx.shadowColor = ctx;
+todo(ctx.shadowColor === '#00ff00', "ctx.shadowColor === '#00ff00'");
+ctx.shadowColor = undefined;
+todo(ctx.shadowColor === '#00ff00', "ctx.shadowColor === '#00ff00'");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.attributes.shadowOffset.1.html b/content/canvas/test/test_2d.shadow.attributes.shadowOffset.1.html
new file mode 100644
index 000000000000..a7e40db60526
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.attributes.shadowOffset.1.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.attributes.shadowOffset.1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.shadowOffsetX = 1;
+ctx.shadowOffsetY = 2;
+todo(ctx.shadowOffsetX === 1, "ctx.shadowOffsetX === 1");
+todo(ctx.shadowOffsetY === 2, "ctx.shadowOffsetY === 2");
+ctx.shadowOffsetX = 0.5;
+ctx.shadowOffsetY = 0.25;
+todo(ctx.shadowOffsetX === 0.5, "ctx.shadowOffsetX === 0.5");
+todo(ctx.shadowOffsetY === 0.25, "ctx.shadowOffsetY === 0.25");
+ctx.shadowOffsetX = -0.5;
+ctx.shadowOffsetY = -0.25;
+todo(ctx.shadowOffsetX === -0.5, "ctx.shadowOffsetX === -0.5");
+todo(ctx.shadowOffsetY === -0.25, "ctx.shadowOffsetY === -0.25");
+ctx.shadowOffsetX = 1e6;
+ctx.shadowOffsetY = 1e6;
+todo(ctx.shadowOffsetX === 1e6, "ctx.shadowOffsetX === 1e6");
+todo(ctx.shadowOffsetY === 1e6, "ctx.shadowOffsetY === 1e6");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.get.nonpositive.html b/content/canvas/test/test_2d.shadow.attributes.shadowOffset.2.html
similarity index 56%
rename from content/canvas/test/test_2d.imageData.get.nonpositive.html
rename to content/canvas/test/test_2d.shadow.attributes.shadowOffset.2.html
index c2b52b42a2fb..546be94e6078 100644
--- a/content/canvas/test/test_2d.imageData.get.nonpositive.html
+++ b/content/canvas/test/test_2d.shadow.attributes.shadowOffset.2.html
@@ -1,12 +1,11 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.nonpositive</title>
+<title>Canvas test: 2d.shadow.attributes.shadowOffset.2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -15,25 +14,26 @@ var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
 var _thrown = undefined; try {
-  ctx.getImageData(10, 10, 1, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+  ctx.shadowOffsetX = Infinity;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(10, 10, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+  ctx.shadowOffsetX = -Infinity;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(10, 10, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+  ctx.shadowOffsetX = NaN;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(10, 10, 1, -1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+  ctx.shadowOffsetY = Infinity;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(10, 10, -1, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+  ctx.shadowOffsetY = -Infinity;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 var _thrown = undefined; try {
-  ctx.getImageData(10, 10, -1, -1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+  ctx.shadowOffsetY = NaN;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.shadow.basic.1.html b/content/canvas/test/test_2d.shadow.basic.1.html
new file mode 100644
index 000000000000..acb69c6ca6c3
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.basic.1.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.basic.1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.shadowColor = '#f00';
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.basic.2.html b/content/canvas/test/test_2d.shadow.basic.2.html
new file mode 100644
index 000000000000..4f65c2238d44
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.basic.2.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.basic.2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.shadowColor = '#f00';
+ctx.fillRect(0, -50, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.imageData.put.type.onepixel.html b/content/canvas/test/test_2d.shadow.blur.high.html
similarity index 57%
rename from content/canvas/test/test_2d.imageData.put.type.onepixel.html
rename to content/canvas/test/test_2d.shadow.blur.high.html
index 07c671908412..9a37e7277bc9 100644
--- a/content/canvas/test/test_2d.imageData.put.type.onepixel.html
+++ b/content/canvas/test/test_2d.shadow.blur.high.html
@@ -1,12 +1,11 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.type.onepixel</title>
+<title>Canvas test: 2d.shadow.blur.high</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,10 +13,15 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-ctx.putImageData({ width: 1, height: 1, data: [0, 0, 0, 0] }, 0, 0);
-ok(true, "true"); // no exception
+ctx.fillStyle = '#ff0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#00f';
+ctx.shadowOffsetY = 0;
+ctx.shadowBlur = 555.6;
+ctx.fillRect(-200, -200, 200, 400);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.shadow.blur.low.html b/content/canvas/test/test_2d.shadow.blur.low.html
new file mode 100644
index 000000000000..3419f90a1b31
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.blur.low.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.blur.low</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#ff0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#00f';
+ctx.shadowOffsetY = 25;
+for (var x = 0; x < 100; ++x) {
+    ctx.save();
+    ctx.beginPath();
+    ctx.rect(x, 0, 1, 50);
+    ctx.clip();
+    ctx.shadowBlur = x;
+    ctx.fillRect(-200, -200, 500, 200);
+    ctx.restore();
+}
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.canvas.alpha.html b/content/canvas/test/test_2d.shadow.canvas.alpha.html
new file mode 100644
index 000000000000..c59609e89f28
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.canvas.alpha.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.canvas.alpha</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = 'rgba(255, 0, 0, 0.5)';
+ctx2.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#00f';
+ctx.drawImage(canvas2, 0, -50);
+
+todo_isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_transparent50.png" id="transparent50.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.shadow.canvas.basic.html b/content/canvas/test/test_2d.shadow.canvas.basic.html
new file mode 100644
index 000000000000..22f0cc4da254
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.canvas.basic.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.canvas.basic</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#f00';
+ctx2.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = 50;
+ctx.drawImage(canvas2, 0, -50);
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.canvas.transparent.1.html b/content/canvas/test/test_2d.shadow.canvas.transparent.1.html
new file mode 100644
index 000000000000..ba911eb83258
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.canvas.transparent.1.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.canvas.transparent.1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetY = 50;
+ctx.drawImage(canvas2, 0, -50);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.canvas.transparent.2.html b/content/canvas/test/test_2d.shadow.canvas.transparent.2.html
new file mode 100644
index 000000000000..2fe761f1fc95
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.canvas.transparent.2.html
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.canvas.transparent.2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#f00';
+ctx2.fillRect(0, 0, 50, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(50, 0, 50, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#0f0';
+ctx.drawImage(canvas2, 50, -50);
+ctx.shadowColor = '#f00';
+ctx.drawImage(canvas2, -50, -50);
+
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.clip.1.html b/content/canvas/test/test_2d.shadow.clip.1.html
new file mode 100644
index 000000000000..9cfe93c716ca
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.clip.1.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.clip.1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(50, 0, 50, 50);
+
+ctx.save();
+ctx.beginPath();
+ctx.rect(50, 0, 50, 50);
+ctx.clip();
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetX = 50;
+ctx.fillRect(0, 0, 50, 50);
+ctx.restore();
+
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.clip.2.html b/content/canvas/test/test_2d.shadow.clip.2.html
new file mode 100644
index 000000000000..4957ef36093b
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.clip.2.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.clip.2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(50, 0, 50, 50);
+
+ctx.save();
+ctx.beginPath();
+ctx.rect(0, 0, 50, 50);
+ctx.clip();
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetX = 50;
+ctx.fillRect(0, 0, 50, 50);
+ctx.restore();
+
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.clip.3.html b/content/canvas/test/test_2d.shadow.clip.3.html
new file mode 100644
index 000000000000..838b069153b5
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.clip.3.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.clip.3</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(50, 0, 50, 50);
+
+ctx.save();
+ctx.beginPath();
+ctx.rect(0, 0, 50, 50);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetX = 50;
+ctx.fillRect(-50, 0, 50, 50);
+ctx.restore();
+
+todo_isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.composite.1.html b/content/canvas/test/test_2d.shadow.composite.1.html
new file mode 100644
index 000000000000..1b5f750da22a
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.composite.1.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.composite.1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetX = 100;
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, 0, 200, 50);
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.composite.2.html b/content/canvas/test/test_2d.shadow.composite.2.html
new file mode 100644
index 000000000000..5fe65baa5f20
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.composite.2.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.composite.2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.shadowColor = '#f00';
+ctx.shadowBlur = 1;
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-10, -10, 120, 70);
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.composite.3.html b/content/canvas/test/test_2d.shadow.composite.3.html
new file mode 100644
index 000000000000..82166f3a5027
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.composite.3.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.composite.3</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.shadowColor = '#f00';
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.composite.4.html b/content/canvas/test/test_2d.shadow.composite.4.html
new file mode 100644
index 000000000000..ccd222507039
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.composite.4.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.composite.4</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.globalCompositeOperation = 'destination-over';
+ctx.shadowColor = '#0f0';
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.gradient.alpha.html b/content/canvas/test/test_2d.shadow.gradient.alpha.html
new file mode 100644
index 000000000000..a02bc705d6a6
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.gradient.alpha.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.gradient.alpha</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var gradient = ctx.createLinearGradient(0, 0, 100, 0);
+gradient.addColorStop(0, 'rgba(255,0,0,0.5)');
+gradient.addColorStop(1, 'rgba(255,0,0,0.5)');
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#00f';
+ctx.fillStyle = gradient;
+ctx.fillRect(0, -50, 100, 50);
+
+todo_isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.gradient.basic.html b/content/canvas/test/test_2d.shadow.gradient.basic.html
new file mode 100644
index 000000000000..e8d6d83105ba
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.gradient.basic.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.gradient.basic</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var gradient = ctx.createLinearGradient(0, 0, 100, 0);
+gradient.addColorStop(0, '#f00');
+gradient.addColorStop(1, '#f00');
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = 50;
+ctx.fillStyle = gradient;
+ctx.fillRect(0, -50, 100, 50);
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.gradient.transparent.1.html b/content/canvas/test/test_2d.shadow.gradient.transparent.1.html
new file mode 100644
index 000000000000..4aded31bdeaa
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.gradient.transparent.1.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.gradient.transparent.1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var gradient = ctx.createLinearGradient(0, 0, 100, 0);
+gradient.addColorStop(0, 'rgba(0,0,0,0)');
+gradient.addColorStop(1, 'rgba(0,0,0,0)');
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetY = 50;
+ctx.fillStyle = gradient;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.gradient.transparent.2.html b/content/canvas/test/test_2d.shadow.gradient.transparent.2.html
new file mode 100644
index 000000000000..2e2bd1cc75da
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.gradient.transparent.2.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.gradient.transparent.2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var gradient = ctx.createLinearGradient(0, 0, 100, 0);
+gradient.addColorStop(0, '#f00');
+gradient.addColorStop(0.499, '#f00');
+gradient.addColorStop(0.5, 'rgba(0,0,0,0)');
+gradient.addColorStop(1, 'rgba(0,0,0,0)');
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(50, 0, 50, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#0f0';
+ctx.fillStyle = gradient;
+ctx.fillRect(0, -50, 100, 50);
+
+todo_isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.image.alpha.html b/content/canvas/test/test_2d.shadow.image.alpha.html
new file mode 100644
index 000000000000..a1e230d7fbab
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.image.alpha.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.image.alpha</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#00f';
+ctx.drawImage(document.getElementById('transparent50.png'), 0, -50);
+
+todo_isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_transparent50.png" id="transparent50.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.shadow.image.basic.html b/content/canvas/test/test_2d.shadow.image.basic.html
new file mode 100644
index 000000000000..d3b58146b808
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.image.basic.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.image.basic</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = 50;
+ctx.drawImage(document.getElementById('red.png'), 0, -50);
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.shadow.image.scale.html b/content/canvas/test/test_2d.shadow.image.scale.html
new file mode 100644
index 000000000000..526a505331f9
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.image.scale.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.image.scale</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#0f0';
+ctx.drawImage(document.getElementById('redtransparent.png'), 0, 0, 100, 50, -10, -50, 240, 50);
+
+todo_isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+todo_isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_redtransparent.png" id="redtransparent.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.shadow.image.section.html b/content/canvas/test/test_2d.shadow.image.section.html
new file mode 100644
index 000000000000..8c74ae449279
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.image.section.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.image.section</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#f00';
+ctx.drawImage(document.getElementById('redtransparent.png'), 50, 0, 50, 50, 0, -50, 50, 50);
+
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_redtransparent.png" id="redtransparent.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.shadow.image.transparent.1.html b/content/canvas/test/test_2d.shadow.image.transparent.1.html
new file mode 100644
index 000000000000..4c37a7fdeb90
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.image.transparent.1.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.image.transparent.1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetY = 50;
+ctx.drawImage(document.getElementById('transparent.png'), 0, -50);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_transparent.png" id="transparent.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.shadow.image.transparent.2.html b/content/canvas/test/test_2d.shadow.image.transparent.2.html
new file mode 100644
index 000000000000..174dd4e1cb59
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.image.transparent.2.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.image.transparent.2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(50, 0, 50, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#0f0';
+ctx.drawImage(document.getElementById('redtransparent.png'), 50, -50);
+ctx.shadowColor = '#f00';
+ctx.drawImage(document.getElementById('redtransparent.png'), -50, -50);
+
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_redtransparent.png" id="redtransparent.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.shadow.offset.negativeX.html b/content/canvas/test/test_2d.shadow.offset.negativeX.html
new file mode 100644
index 000000000000..36d10e987773
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.offset.negativeX.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.offset.negativeX</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetX = -50;
+ctx.fillRect(50, 0, 50, 50);
+todo_isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.offset.negativeY.html b/content/canvas/test/test_2d.shadow.offset.negativeY.html
new file mode 100644
index 000000000000..2877883fbc3f
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.offset.negativeY.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.offset.negativeY</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = -25;
+ctx.fillRect(0, 25, 100, 25);
+todo_isPixel(ctx, 50,12, 0,255,0,255, "50,12", "0,255,0,255", 0);
+isPixel(ctx, 50,37, 0,255,0,255, "50,37", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.offset.positiveX.html b/content/canvas/test/test_2d.shadow.offset.positiveX.html
new file mode 100644
index 000000000000..6bfab214654d
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.offset.positiveX.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.offset.positiveX</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetX = 50;
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.offset.positiveY.html b/content/canvas/test/test_2d.shadow.offset.positiveY.html
new file mode 100644
index 000000000000..d089d4b5169f
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.offset.positiveY.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.offset.positiveY</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = 25;
+ctx.fillRect(0, 0, 100, 25);
+isPixel(ctx, 50,12, 0,255,0,255, "50,12", "0,255,0,255", 0);
+todo_isPixel(ctx, 50,37, 0,255,0,255, "50,37", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.outside.html b/content/canvas/test/test_2d.shadow.outside.html
new file mode 100644
index 000000000000..25061278a140
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.outside.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.outside</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetX = 100;
+ctx.fillRect(-100, 0, 25, 50);
+ctx.shadowOffsetX = -100;
+ctx.fillRect(175, 0, 25, 50);
+ctx.shadowOffsetX = 0;
+ctx.shadowOffsetY = 100;
+ctx.fillRect(25, -100, 50, 25);
+ctx.shadowOffsetY = -100;
+ctx.fillRect(25, 125, 50, 25);
+todo_isPixel(ctx, 12,25, 0,255,0,255, "12,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 87,25, 0,255,0,255, "87,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 50,12, 0,255,0,255, "50,12", "0,255,0,255", 0);
+todo_isPixel(ctx, 50,37, 0,255,0,255, "50,37", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.pattern.alpha.html b/content/canvas/test/test_2d.shadow.pattern.alpha.html
new file mode 100644
index 000000000000..e5580e262e3b
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.pattern.alpha.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.pattern.alpha</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var pattern = ctx.createPattern(document.getElementById('transparent50.png'), 'repeat');
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#00f';
+ctx.fillStyle = pattern;
+ctx.fillRect(0, -50, 100, 50);
+
+todo_isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_transparent50.png" id="transparent50.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.shadow.pattern.basic.html b/content/canvas/test/test_2d.shadow.pattern.basic.html
new file mode 100644
index 000000000000..e58763712aed
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.pattern.basic.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.pattern.basic</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var pattern = ctx.createPattern(document.getElementById('red.png'), 'repeat');
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = 50;
+ctx.fillStyle = pattern;
+ctx.fillRect(0, -50, 100, 50);
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.shadow.pattern.transparent.1.html b/content/canvas/test/test_2d.shadow.pattern.transparent.1.html
new file mode 100644
index 000000000000..b53460c60d8b
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.pattern.transparent.1.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.pattern.transparent.1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var pattern = ctx.createPattern(document.getElementById('transparent.png'), 'repeat');
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetY = 50;
+ctx.fillStyle = pattern;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_transparent.png" id="transparent.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.shadow.pattern.transparent.2.html b/content/canvas/test/test_2d.shadow.pattern.transparent.2.html
new file mode 100644
index 000000000000..4d07fd0c3a8f
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.pattern.transparent.2.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.pattern.transparent.2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var pattern = ctx.createPattern(document.getElementById('redtransparent.png'), 'repeat');
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(50, 0, 50, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#0f0';
+ctx.fillStyle = pattern;
+ctx.fillRect(0, -50, 100, 50);
+
+todo_isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+<img src="image_redtransparent.png" id="redtransparent.png" class="resource">
+
diff --git a/content/canvas/test/test_2d.shadow.stroke.basic.html b/content/canvas/test/test_2d.shadow.stroke.basic.html
new file mode 100644
index 000000000000..bbf18d2fa9e5
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.stroke.basic.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.stroke.basic</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = 50;
+ctx.beginPath();
+ctx.lineWidth = 50;
+ctx.moveTo(0, -25);
+ctx.lineTo(100, -25);
+ctx.stroke();
+
+todo_isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.stroke.cap.1.html b/content/canvas/test/test_2d.shadow.stroke.cap.1.html
new file mode 100644
index 000000000000..4010e751e728
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.stroke.cap.1.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.stroke.cap.1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetY = 50;
+ctx.beginPath();
+ctx.lineWidth = 50;
+ctx.lineCap = 'butt';
+ctx.moveTo(-50, -25);
+ctx.lineTo(0, -25);
+ctx.moveTo(100, -25);
+ctx.lineTo(150, -25);
+ctx.stroke();
+
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.stroke.cap.2.html b/content/canvas/test/test_2d.shadow.stroke.cap.2.html
new file mode 100644
index 000000000000..0aba8f392612
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.stroke.cap.2.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.stroke.cap.2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = 50;
+ctx.beginPath();
+ctx.lineWidth = 50;
+ctx.lineCap = 'square';
+ctx.moveTo(25, -25);
+ctx.lineTo(75, -25);
+ctx.stroke();
+
+todo_isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+todo_isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.line.cap.zeroline.square.html b/content/canvas/test/test_2d.shadow.stroke.join.1.html
similarity index 65%
rename from content/canvas/test/test_2d.line.cap.zeroline.square.html
rename to content/canvas/test/test_2d.shadow.stroke.join.1.html
index 73f3eb674ae2..ac113fe27ebf 100644
--- a/content/canvas/test/test_2d.line.cap.zeroline.square.html
+++ b/content/canvas/test/test_2d.shadow.stroke.join.1.html
@@ -1,19 +1,18 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.line.cap.zeroline.square</title>
+<title>Canvas test: 2d.shadow.stroke.join.1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -28,22 +27,24 @@ var ctx = canvas.getContext('2d');
 
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
-
 ctx.strokeStyle = '#f00';
-ctx.lineWidth = 100;
-ctx.lineCap = 'square';
-
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetX = 100;
+ctx.lineWidth = 200;
+ctx.lineJoin = 'bevel';
 ctx.beginPath();
-ctx.moveTo(50, 25);
-ctx.lineTo(50, 25);
+ctx.moveTo(-200, -50);
+ctx.lineTo(-150, -50);
+ctx.lineTo(-151, -100);
 ctx.stroke();
 
 isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
 isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.shadow.stroke.join.2.html b/content/canvas/test/test_2d.shadow.stroke.join.2.html
new file mode 100644
index 000000000000..bd9a16ec1411
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.stroke.join.2.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.stroke.join.2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(50, 0, 50, 50);
+ctx.strokeStyle = '#f00';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetX = 100;
+ctx.lineWidth = 200;
+ctx.lineJoin = 'miter';
+ctx.beginPath();
+ctx.moveTo(-200, -50);
+ctx.lineTo(-150, -50);
+ctx.lineTo(-151, -100);
+ctx.stroke();
+
+todo_isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+todo_isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.stroke.join.3.html b/content/canvas/test/test_2d.shadow.stroke.join.3.html
new file mode 100644
index 000000000000..c4c98099ffa2
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.stroke.join.3.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.stroke.join.3</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetX = 100;
+ctx.lineWidth = 200;
+ctx.lineJoin = 'miter';
+ctx.miterLimit = 0.1;
+ctx.beginPath();
+ctx.moveTo(-200, -50);
+ctx.lineTo(-150, -50);
+ctx.lineTo(-151, -100); // (not an exact right angle, to avoid some other bug in Firefox 3)
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.transform.1.html b/content/canvas/test/test_2d.shadow.transform.1.html
new file mode 100644
index 000000000000..9d1cf5fa25db
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.transform.1.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.transform.1</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#0f0';
+ctx.translate(100, 100);
+ctx.fillRect(-100, -150, 100, 50);
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.shadow.transform.2.html b/content/canvas/test/test_2d.shadow.transform.2.html
new file mode 100644
index 000000000000..29e1fb630de6
--- /dev/null
+++ b/content/canvas/test/test_2d.shadow.transform.2.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.shadow.transform.2</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#0f0';
+ctx.rotate(Math.PI)
+ctx.fillRect(-100, 0, 100, 50);
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.state.saverestore.bitmap.html b/content/canvas/test/test_2d.state.saverestore.bitmap.html
index 45af1c80b571..238562dc5f97 100644
--- a/content/canvas/test/test_2d.state.saverestore.bitmap.html
+++ b/content/canvas/test/test_2d.state.saverestore.bitmap.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.bitmap</title>
+<!-- Testing: save()/restore() does not affect the current bitmap -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +34,8 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.restore();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.clip.html b/content/canvas/test/test_2d.state.saverestore.clip.html
index 2051507682b4..87d2e711bbe2 100644
--- a/content/canvas/test/test_2d.state.saverestore.clip.html
+++ b/content/canvas/test/test_2d.state.saverestore.clip.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.clip</title>
+<!-- Testing: save()/restore() affects the clipping path -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -36,7 +36,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.fillStyle.html b/content/canvas/test/test_2d.state.saverestore.fillStyle.html
index c2f758f3ddb0..5962c8b3e66f 100644
--- a/content/canvas/test/test_2d.state.saverestore.fillStyle.html
+++ b/content/canvas/test/test_2d.state.saverestore.fillStyle.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.fillStyle</title>
+<!-- Testing: save()/restore() works for fillStyle -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -30,7 +30,8 @@ ctx.save();
 ok(ctx.fillStyle === old, "ctx.fillStyle === old");
 ctx.restore();
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.globalAlpha.html b/content/canvas/test/test_2d.state.saverestore.globalAlpha.html
index 7f929136a558..ba9e0dfb43a2 100644
--- a/content/canvas/test/test_2d.state.saverestore.globalAlpha.html
+++ b/content/canvas/test/test_2d.state.saverestore.globalAlpha.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.globalAlpha</title>
+<!-- Testing: save()/restore() works for globalAlpha -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -30,7 +30,8 @@ ctx.save();
 ok(ctx.globalAlpha === old, "ctx.globalAlpha === old");
 ctx.restore();
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.globalCompositeOperation.html b/content/canvas/test/test_2d.state.saverestore.globalCompositeOperation.html
index 386db513f31f..33229bc89b9c 100644
--- a/content/canvas/test/test_2d.state.saverestore.globalCompositeOperation.html
+++ b/content/canvas/test/test_2d.state.saverestore.globalCompositeOperation.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.globalCompositeOperation</title>
+<!-- Testing: save()/restore() works for globalCompositeOperation -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -30,7 +30,8 @@ ctx.save();
 ok(ctx.globalCompositeOperation === old, "ctx.globalCompositeOperation === old");
 ctx.restore();
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.lineCap.html b/content/canvas/test/test_2d.state.saverestore.lineCap.html
index f9caf5d63429..0be4c352f292 100644
--- a/content/canvas/test/test_2d.state.saverestore.lineCap.html
+++ b/content/canvas/test/test_2d.state.saverestore.lineCap.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.lineCap</title>
+<!-- Testing: save()/restore() works for lineCap -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -30,7 +30,8 @@ ctx.save();
 ok(ctx.lineCap === old, "ctx.lineCap === old");
 ctx.restore();
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.lineJoin.html b/content/canvas/test/test_2d.state.saverestore.lineJoin.html
index 92b15d976cad..e927842d6996 100644
--- a/content/canvas/test/test_2d.state.saverestore.lineJoin.html
+++ b/content/canvas/test/test_2d.state.saverestore.lineJoin.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.lineJoin</title>
+<!-- Testing: save()/restore() works for lineJoin -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -30,7 +30,8 @@ ctx.save();
 ok(ctx.lineJoin === old, "ctx.lineJoin === old");
 ctx.restore();
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.lineWidth.html b/content/canvas/test/test_2d.state.saverestore.lineWidth.html
index 7087499e849a..c9965310ce22 100644
--- a/content/canvas/test/test_2d.state.saverestore.lineWidth.html
+++ b/content/canvas/test/test_2d.state.saverestore.lineWidth.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.lineWidth</title>
+<!-- Testing: save()/restore() works for lineWidth -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -30,7 +30,8 @@ ctx.save();
 ok(ctx.lineWidth === old, "ctx.lineWidth === old");
 ctx.restore();
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.miterLimit.html b/content/canvas/test/test_2d.state.saverestore.miterLimit.html
index 9f6d6be75c36..60a4ca1ce919 100644
--- a/content/canvas/test/test_2d.state.saverestore.miterLimit.html
+++ b/content/canvas/test/test_2d.state.saverestore.miterLimit.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.miterLimit</title>
+<!-- Testing: save()/restore() works for miterLimit -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -30,7 +30,8 @@ ctx.save();
 ok(ctx.miterLimit === old, "ctx.miterLimit === old");
 ctx.restore();
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.path.html b/content/canvas/test/test_2d.state.saverestore.path.html
index a8c63d2062cc..adac68349dde 100644
--- a/content/canvas/test/test_2d.state.saverestore.path.html
+++ b/content/canvas/test/test_2d.state.saverestore.path.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.path</title>
+<!-- Testing: save()/restore() does not affect the current path -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +35,8 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.shadowBlur.html b/content/canvas/test/test_2d.state.saverestore.shadowBlur.html
index d9d1ae81dcb6..a8af12cc8efd 100644
--- a/content/canvas/test/test_2d.state.saverestore.shadowBlur.html
+++ b/content/canvas/test/test_2d.state.saverestore.shadowBlur.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.shadowBlur</title>
+<!-- Testing: save()/restore() works for shadowBlur -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -30,7 +30,8 @@ ctx.save();
 ok(ctx.shadowBlur === old, "ctx.shadowBlur === old");
 ctx.restore();
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.shadowColor.html b/content/canvas/test/test_2d.state.saverestore.shadowColor.html
index ce1680e134d2..92187e83f7ef 100644
--- a/content/canvas/test/test_2d.state.saverestore.shadowColor.html
+++ b/content/canvas/test/test_2d.state.saverestore.shadowColor.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.shadowColor</title>
+<!-- Testing: save()/restore() works for shadowColor -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -30,7 +30,8 @@ ctx.save();
 ok(ctx.shadowColor === old, "ctx.shadowColor === old");
 ctx.restore();
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.shadowOffsetX.html b/content/canvas/test/test_2d.state.saverestore.shadowOffsetX.html
index 5a4deaba47a5..bbb99e35e800 100644
--- a/content/canvas/test/test_2d.state.saverestore.shadowOffsetX.html
+++ b/content/canvas/test/test_2d.state.saverestore.shadowOffsetX.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.shadowOffsetX</title>
+<!-- Testing: save()/restore() works for shadowOffsetX -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -30,7 +30,8 @@ ctx.save();
 ok(ctx.shadowOffsetX === old, "ctx.shadowOffsetX === old");
 ctx.restore();
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.shadowOffsetY.html b/content/canvas/test/test_2d.state.saverestore.shadowOffsetY.html
index 00a5410eef33..9f1e82b75d7a 100644
--- a/content/canvas/test/test_2d.state.saverestore.shadowOffsetY.html
+++ b/content/canvas/test/test_2d.state.saverestore.shadowOffsetY.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.shadowOffsetY</title>
+<!-- Testing: save()/restore() works for shadowOffsetY -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -30,7 +30,8 @@ ctx.save();
 ok(ctx.shadowOffsetY === old, "ctx.shadowOffsetY === old");
 ctx.restore();
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.stack.html b/content/canvas/test/test_2d.state.saverestore.stack.html
index b3fe003cdd97..9a039b428727 100644
--- a/content/canvas/test/test_2d.state.saverestore.stack.html
+++ b/content/canvas/test/test_2d.state.saverestore.stack.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.stack</title>
+<!-- Testing: save()/restore() can be nested as a stack -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -25,7 +25,8 @@ ok(ctx.lineWidth == 2, "ctx.lineWidth == 2");
 ctx.restore();
 ok(ctx.lineWidth == 1, "ctx.lineWidth == 1");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.stackdepth.html b/content/canvas/test/test_2d.state.saverestore.stackdepth.html
index 5f0841389f7a..8079dbdd5cb6 100644
--- a/content/canvas/test/test_2d.state.saverestore.stackdepth.html
+++ b/content/canvas/test/test_2d.state.saverestore.stackdepth.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.stackdepth</title>
+<!-- Testing: save()/restore() stack depth is not unreasonably limited -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -26,7 +26,8 @@ for (var i = limit-1; i > 0; --i)
     ctx.restore();
 }
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.strokeStyle.html b/content/canvas/test/test_2d.state.saverestore.strokeStyle.html
index d0d17e7afe80..89b93cfe102f 100644
--- a/content/canvas/test/test_2d.state.saverestore.strokeStyle.html
+++ b/content/canvas/test/test_2d.state.saverestore.strokeStyle.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.strokeStyle</title>
+<!-- Testing: save()/restore() works for strokeStyle -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -30,7 +30,8 @@ ctx.save();
 ok(ctx.strokeStyle === old, "ctx.strokeStyle === old");
 ctx.restore();
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.transformation.html b/content/canvas/test/test_2d.state.saverestore.transformation.html
index 44fba523b2af..c26df6157d19 100644
--- a/content/canvas/test/test_2d.state.saverestore.transformation.html
+++ b/content/canvas/test/test_2d.state.saverestore.transformation.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.state.saverestore.transformation</title>
+<!-- Testing: save()/restore() affects the current transformation matrix -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +35,8 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(-200, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.state.saverestore.underflow.html b/content/canvas/test/test_2d.state.saverestore.underflow.html
new file mode 100644
index 000000000000..d615f4bf8b3a
--- /dev/null
+++ b/content/canvas/test/test_2d.state.saverestore.underflow.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.underflow - bug 296821</title>
+<!-- Testing: restore() with an empty stack has no effect -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+for (var i = 0; i < 16; ++i)
+    ctx.restore();
+ctx.lineWidth = 0.5;
+ctx.restore();
+ok(ctx.lineWidth == 0.5, "ctx.lineWidth == 0.5");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.strokeRect.basic.html b/content/canvas/test/test_2d.strokeRect.basic.html
index fe25bb0ae971..07015ea2fba5 100644
--- a/content/canvas/test/test_2d.strokeRect.basic.html
+++ b/content/canvas/test/test_2d.strokeRect.basic.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.strokeRect.basic</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -31,7 +30,8 @@ ctx.lineWidth = 50;
 ctx.strokeRect(25, 24, 50, 2);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.strokeRect.clip.html b/content/canvas/test/test_2d.strokeRect.clip.html
index 86048ffdadbb..bebdd2d32241 100644
--- a/content/canvas/test/test_2d.strokeRect.clip.html
+++ b/content/canvas/test/test_2d.strokeRect.clip.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.strokeRect.clip</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -42,7 +41,8 @@ ctx.fillRect(0, 0, 16, 16);
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.strokeRect.globalalpha.html b/content/canvas/test/test_2d.strokeRect.globalalpha.html
index bae4526bd209..2580c2a9a4fa 100644
--- a/content/canvas/test/test_2d.strokeRect.globalalpha.html
+++ b/content/canvas/test/test_2d.strokeRect.globalalpha.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.strokeRect.globalalpha</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.lineWidth = 50;
 ctx.strokeRect(25, 24, 50, 2);
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.strokeRect.globalcomposite.html b/content/canvas/test/test_2d.strokeRect.globalcomposite.html
index 1f8967378231..a7d0af51f421 100644
--- a/content/canvas/test/test_2d.strokeRect.globalcomposite.html
+++ b/content/canvas/test/test_2d.strokeRect.globalcomposite.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.strokeRect.globalcomposite</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.lineWidth = 50;
 ctx.strokeRect(25, 24, 50, 2);
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.strokeRect.negative.html b/content/canvas/test/test_2d.strokeRect.negative.html
index 7cff56722977..fd8f353010af 100644
--- a/content/canvas/test/test_2d.strokeRect.negative.html
+++ b/content/canvas/test/test_2d.strokeRect.negative.html
@@ -2,11 +2,22 @@
 <title>Canvas test: 2d.strokeRect.negative</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,14 +25,21 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-var _thrown = undefined; try {
-  ctx.strokeRect(0, 0, -1, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-var _thrown = undefined; try {
-  ctx.strokeRect(0, 0, 1, -1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 25;
+ctx.strokeRect(12, 12, 26, 1);
+ctx.strokeRect(88, 12, -26, 1);
+ctx.strokeRect(12, 38, 26, -1);
+ctx.strokeRect(88, 38, -26, -1);
+isPixel(ctx, 25,12, 0,255,0,255, "25,12", "0,255,0,255", 0);
+isPixel(ctx, 75,12, 0,255,0,255, "75,12", "0,255,0,255", 0);
+isPixel(ctx, 25,37, 0,255,0,255, "25,37", "0,255,0,255", 0);
+isPixel(ctx, 75,37, 0,255,0,255, "75,37", "0,255,0,255", 0);
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.strokeRect.nonfinite.html b/content/canvas/test/test_2d.strokeRect.nonfinite.html
new file mode 100644
index 000000000000..3de843207f78
--- /dev/null
+++ b/content/canvas/test/test_2d.strokeRect.nonfinite.html
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.strokeRect.nonfinite</title>
+<!-- Testing: strokeRect() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 150;
+ctx.strokeRect(Infinity, 0, 100, 50);
+ctx.strokeRect(-Infinity, 0, 100, 50);
+ctx.strokeRect(NaN, 0, 100, 50);
+ctx.strokeRect(0, Infinity, 100, 50);
+ctx.strokeRect(0, -Infinity, 100, 50);
+ctx.strokeRect(0, NaN, 100, 50);
+ctx.strokeRect(0, 0, Infinity, 50);
+ctx.strokeRect(0, 0, -Infinity, 50);
+ctx.strokeRect(0, 0, NaN, 50);
+ctx.strokeRect(0, 0, 100, Infinity);
+ctx.strokeRect(0, 0, 100, -Infinity);
+ctx.strokeRect(0, 0, 100, NaN);
+ctx.strokeRect(Infinity, Infinity, 100, 50);
+ctx.strokeRect(Infinity, Infinity, Infinity, 50);
+ctx.strokeRect(Infinity, Infinity, Infinity, Infinity);
+ctx.strokeRect(Infinity, Infinity, 100, Infinity);
+ctx.strokeRect(Infinity, 0, Infinity, 50);
+ctx.strokeRect(Infinity, 0, Infinity, Infinity);
+ctx.strokeRect(Infinity, 0, 100, Infinity);
+ctx.strokeRect(0, Infinity, Infinity, 50);
+ctx.strokeRect(0, Infinity, Infinity, Infinity);
+ctx.strokeRect(0, Infinity, 100, Infinity);
+ctx.strokeRect(0, 0, Infinity, Infinity);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.strokeRect.path.html b/content/canvas/test/test_2d.strokeRect.path.html
index 16e17bb5e1c4..8482fc312265 100644
--- a/content/canvas/test/test_2d.strokeRect.path.html
+++ b/content/canvas/test/test_2d.strokeRect.path.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.strokeRect.path</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +34,8 @@ ctx.fillStyle = '#0f0';
 ctx.fill();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.strokeRect.shadow.html b/content/canvas/test/test_2d.strokeRect.shadow.html
index 95f1d502e0e4..ea56d2d71ac6 100644
--- a/content/canvas/test/test_2d.strokeRect.shadow.html
+++ b/content/canvas/test/test_2d.strokeRect.shadow.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.strokeRect.shadow</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -47,7 +46,8 @@ ctx.strokeRect(0, -75, 100, 50);
 
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.strokeRect.transform.html b/content/canvas/test/test_2d.strokeRect.transform.html
index c8c330a74a25..ec14e111787f 100644
--- a/content/canvas/test/test_2d.strokeRect.transform.html
+++ b/content/canvas/test/test_2d.strokeRect.transform.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.strokeRect.transform</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +32,8 @@ ctx.lineWidth = 5;
 ctx.strokeRect(2.5, -2.6, 5, 0.2);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.strokeRect.zero.1.html b/content/canvas/test/test_2d.strokeRect.zero.1.html
index 49c75598b749..fa38310888b0 100644
--- a/content/canvas/test/test_2d.strokeRect.zero.1.html
+++ b/content/canvas/test/test_2d.strokeRect.zero.1.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.strokeRect.zero.1</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -31,7 +30,8 @@ ctx.lineWidth = 250;
 ctx.strokeRect(50, 25, 0, 0);
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.strokeRect.zero.2.html b/content/canvas/test/test_2d.strokeRect.zero.2.html
index c5ef93e7ed37..affe71b91ba5 100644
--- a/content/canvas/test/test_2d.strokeRect.zero.2.html
+++ b/content/canvas/test/test_2d.strokeRect.zero.2.html
@@ -2,25 +2,33 @@
 <title>Canvas test: 2d.strokeRect.zero.2</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
        "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    isPixel(ctx, x,y, r,g,b,a, pos, colour, d, todo);
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
 }
 
 SimpleTest.waitForExplicitFinish();
@@ -36,7 +44,8 @@ ctx.lineJoin = 'round';
 ctx.strokeRect(50, 25, 0, 0);
 todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.strokeRect.zero.3.html b/content/canvas/test/test_2d.strokeRect.zero.3.html
index 2d93f177a8ff..a703aae7a3b1 100644
--- a/content/canvas/test/test_2d.strokeRect.zero.3.html
+++ b/content/canvas/test/test_2d.strokeRect.zero.3.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.strokeRect.zero.3</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -31,7 +30,8 @@ ctx.lineWidth = 50;
 ctx.strokeRect(0, 25, 100, 0);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.strokeRect.zero.4.html b/content/canvas/test/test_2d.strokeRect.zero.4.html
index bc1d75aa4a43..d354f4e7e9f5 100644
--- a/content/canvas/test/test_2d.strokeRect.zero.4.html
+++ b/content/canvas/test/test_2d.strokeRect.zero.4.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.strokeRect.zero.4</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.lineCap = 'round';
 ctx.strokeRect(100, 25, 100, 0);
 isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.strokeRect.zero.5.html b/content/canvas/test/test_2d.strokeRect.zero.5.html
index a1e472250907..4790164ab386 100644
--- a/content/canvas/test/test_2d.strokeRect.zero.5.html
+++ b/content/canvas/test/test_2d.strokeRect.zero.5.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.strokeRect.zero.5</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +31,8 @@ ctx.lineJoin = 'round';
 ctx.strokeRect(100, 25, 100, 0);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.strokeStyle.default.html b/content/canvas/test/test_2d.strokeStyle.default.html
index afdeb1e71d6a..bbd48c5479a3 100644
--- a/content/canvas/test/test_2d.strokeStyle.default.html
+++ b/content/canvas/test/test_2d.strokeStyle.default.html
@@ -2,11 +2,10 @@
 <title>Canvas test: 2d.strokeStyle.default</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +15,8 @@ var ctx = canvas.getContext('2d');
 
 ok(ctx.strokeStyle == '#000000', "ctx.strokeStyle == '#000000'");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.order.html b/content/canvas/test/test_2d.transformation.order.html
index c8f437b1692d..a76fdca5b889 100644
--- a/content/canvas/test/test_2d.transformation.order.html
+++ b/content/canvas/test/test_2d.transformation.order.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.order</title>
+<!-- Testing: Transformations are applied in the right order -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +35,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, -50, 50, 50);
 isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.rotate.direction.html b/content/canvas/test/test_2d.transformation.rotate.direction.html
index 68f3924ba4a8..a6bab52320b7 100644
--- a/content/canvas/test/test_2d.transformation.rotate.direction.html
+++ b/content/canvas/test/test_2d.transformation.rotate.direction.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.rotate.direction</title>
+<!-- Testing: rotate() is clockwise -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +34,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, -100, 50, 100);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.rotate.infinity.html b/content/canvas/test/test_2d.transformation.rotate.infinity.html
deleted file mode 100644
index 5c8d31208d8b..000000000000
--- a/content/canvas/test/test_2d.transformation.rotate.infinity.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.rotate.infinity</title>
-<script src="/MochiKit/MochiKit.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-var _deferred = false;
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.rotate(Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-
-if (!_deferred) SimpleTest.finish();
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.rotate.nonfinite.html b/content/canvas/test/test_2d.transformation.rotate.nonfinite.html
new file mode 100644
index 000000000000..44ffdf0b924f
--- /dev/null
+++ b/content/canvas/test/test_2d.transformation.rotate.nonfinite.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.rotate.nonfinite</title>
+<!-- Testing: rotate() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(100, 10);
+ctx.rotate(Infinity);
+ctx.rotate(-Infinity);
+ctx.rotate(NaN);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -10, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.transformation.rotate.radians.html b/content/canvas/test/test_2d.transformation.rotate.radians.html
index c0a0c103a215..7b44a8b80eda 100644
--- a/content/canvas/test/test_2d.transformation.rotate.radians.html
+++ b/content/canvas/test/test_2d.transformation.rotate.radians.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.rotate.radians</title>
+<!-- Testing: rotate() uses radians -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -29,12 +29,13 @@ var ctx = canvas.getContext('2d');
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 
-ctx.rotate(Math.PI);
+ctx.rotate(Math.PI); // should fail obviously if this is 3.1 degrees
 ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -50, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.rotate.wrap.html b/content/canvas/test/test_2d.transformation.rotate.wrap.html
index 852d2c1d5fc2..986ab914e130 100644
--- a/content/canvas/test/test_2d.transformation.rotate.wrap.html
+++ b/content/canvas/test/test_2d.transformation.rotate.wrap.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.rotate.wrap</title>
+<!-- Testing: rotate() wraps large positive values correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -29,7 +29,7 @@ var ctx = canvas.getContext('2d');
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 
-ctx.rotate(Math.PI * (1 + 4096)); // == PI (mod 2*PI)
+ctx.rotate(Math.PI * (1 + 4096)); // == pi (mod 2*pi)
 // We need about pi +/- 0.001 in order to get correct-looking results
 // 32-bit floats can store pi*4097 with precision 2^-10, so that should
 // be safe enough on reasonable implementations
@@ -39,7 +39,8 @@ isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 isPixel(ctx, 98,2, 0,255,0,255, "98,2", "0,255,0,255", 0);
 isPixel(ctx, 98,47, 0,255,0,255, "98,47", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.rotate.wrapnegative.html b/content/canvas/test/test_2d.transformation.rotate.wrapnegative.html
index da731889e606..8fac7903c7a7 100644
--- a/content/canvas/test/test_2d.transformation.rotate.wrapnegative.html
+++ b/content/canvas/test/test_2d.transformation.rotate.wrapnegative.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.rotate.wrapnegative</title>
+<!-- Testing: rotate() wraps large negative values correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -36,7 +36,8 @@ isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 isPixel(ctx, 98,2, 0,255,0,255, "98,2", "0,255,0,255", 0);
 isPixel(ctx, 98,47, 0,255,0,255, "98,47", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.rotate.zero.html b/content/canvas/test/test_2d.transformation.rotate.zero.html
index 26726ac69b53..077698f153b3 100644
--- a/content/canvas/test/test_2d.transformation.rotate.zero.html
+++ b/content/canvas/test/test_2d.transformation.rotate.zero.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.rotate.zero</title>
+<!-- Testing: rotate() by 0 does nothing -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +34,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.scale.basic.html b/content/canvas/test/test_2d.transformation.scale.basic.html
index efa468fa3462..db3710812ee1 100644
--- a/content/canvas/test/test_2d.transformation.scale.basic.html
+++ b/content/canvas/test/test_2d.transformation.scale.basic.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.scale.basic</title>
+<!-- Testing: scale() works -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +34,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 50, 12.5);
 isPixel(ctx, 90,40, 0,255,0,255, "90,40", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.scale.large.html b/content/canvas/test/test_2d.transformation.scale.large.html
index 4657dbdea138..f8ed98f242cf 100644
--- a/content/canvas/test/test_2d.transformation.scale.large.html
+++ b/content/canvas/test/test_2d.transformation.scale.large.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.scale.large</title>
+<!-- Testing: scale() with large scale factors works -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +34,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 1, 1);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.scale.multiple.html b/content/canvas/test/test_2d.transformation.scale.multiple.html
index f83be4ad9d75..635f694ca971 100644
--- a/content/canvas/test/test_2d.transformation.scale.multiple.html
+++ b/content/canvas/test/test_2d.transformation.scale.multiple.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.scale.multiple</title>
+<!-- Testing: Multiple scale()s combine -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +35,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 50, 25);
 isPixel(ctx, 90,40, 0,255,0,255, "90,40", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.scale.negative.html b/content/canvas/test/test_2d.transformation.scale.negative.html
index 20c80f1a39ae..f96ece80849d 100644
--- a/content/canvas/test/test_2d.transformation.scale.negative.html
+++ b/content/canvas/test/test_2d.transformation.scale.negative.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.scale.negative</title>
+<!-- Testing: scale() with negative scale factors works -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -43,7 +43,8 @@ ctx.restore();
 isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
 isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.scale.nonfinite.html b/content/canvas/test/test_2d.transformation.scale.nonfinite.html
new file mode 100644
index 000000000000..a60a2005dd5b
--- /dev/null
+++ b/content/canvas/test/test_2d.transformation.scale.nonfinite.html
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.scale.nonfinite</title>
+<!-- Testing: scale() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(100, 10);
+ctx.scale(Infinity, 0.1);
+ctx.scale(-Infinity, 0.1);
+ctx.scale(NaN, 0.1);
+ctx.scale(0.1, Infinity);
+ctx.scale(0.1, -Infinity);
+ctx.scale(0.1, NaN);
+ctx.scale(Infinity, Infinity);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -10, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.transformation.scale.zero.html b/content/canvas/test/test_2d.transformation.scale.zero.html
index af734fae4998..673e8ae3417f 100644
--- a/content/canvas/test/test_2d.transformation.scale.zero.html
+++ b/content/canvas/test/test_2d.transformation.scale.zero.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.scale.zero</title>
+<!-- Testing: scale() with a scale factor of zero works -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -44,7 +44,8 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.restore();
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.setTransform.multiple.html b/content/canvas/test/test_2d.transformation.setTransform.multiple.html
index 73f5079347a3..e525c6516788 100644
--- a/content/canvas/test/test_2d.transformation.setTransform.multiple.html
+++ b/content/canvas/test/test_2d.transformation.setTransform.multiple.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.transformation.setTransform.multiple</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +34,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 50, 25);
 isPixel(ctx, 75,35, 0,255,0,255, "75,35", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.setTransform.nonfinite.html b/content/canvas/test/test_2d.transformation.setTransform.nonfinite.html
new file mode 100644
index 000000000000..07c00a5a4397
--- /dev/null
+++ b/content/canvas/test/test_2d.transformation.setTransform.nonfinite.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.setTransform.nonfinite</title>
+<!-- Testing: setTransform() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(100, 10);
+ctx.setTransform(Infinity, 0, 0, 0, 0, 0);
+ctx.setTransform(-Infinity, 0, 0, 0, 0, 0);
+ctx.setTransform(NaN, 0, 0, 0, 0, 0);
+ctx.setTransform(0, Infinity, 0, 0, 0, 0);
+ctx.setTransform(0, -Infinity, 0, 0, 0, 0);
+ctx.setTransform(0, NaN, 0, 0, 0, 0);
+ctx.setTransform(0, 0, Infinity, 0, 0, 0);
+ctx.setTransform(0, 0, -Infinity, 0, 0, 0);
+ctx.setTransform(0, 0, NaN, 0, 0, 0);
+ctx.setTransform(0, 0, 0, Infinity, 0, 0);
+ctx.setTransform(0, 0, 0, -Infinity, 0, 0);
+ctx.setTransform(0, 0, 0, NaN, 0, 0);
+ctx.setTransform(0, 0, 0, 0, Infinity, 0);
+ctx.setTransform(0, 0, 0, 0, -Infinity, 0);
+ctx.setTransform(0, 0, 0, 0, NaN, 0);
+ctx.setTransform(0, 0, 0, 0, 0, Infinity);
+ctx.setTransform(0, 0, 0, 0, 0, -Infinity);
+ctx.setTransform(0, 0, 0, 0, 0, NaN);
+ctx.setTransform(Infinity, Infinity, 0, 0, 0, 0);
+ctx.setTransform(Infinity, Infinity, Infinity, 0, 0, 0);
+ctx.setTransform(Infinity, Infinity, Infinity, Infinity, 0, 0);
+ctx.setTransform(Infinity, Infinity, Infinity, Infinity, Infinity, 0);
+ctx.setTransform(Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.setTransform(Infinity, Infinity, Infinity, Infinity, 0, Infinity);
+ctx.setTransform(Infinity, Infinity, Infinity, 0, Infinity, 0);
+ctx.setTransform(Infinity, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.setTransform(Infinity, Infinity, Infinity, 0, 0, Infinity);
+ctx.setTransform(Infinity, Infinity, 0, Infinity, 0, 0);
+ctx.setTransform(Infinity, Infinity, 0, Infinity, Infinity, 0);
+ctx.setTransform(Infinity, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.setTransform(Infinity, Infinity, 0, Infinity, 0, Infinity);
+ctx.setTransform(Infinity, Infinity, 0, 0, Infinity, 0);
+ctx.setTransform(Infinity, Infinity, 0, 0, Infinity, Infinity);
+ctx.setTransform(Infinity, Infinity, 0, 0, 0, Infinity);
+ctx.setTransform(Infinity, 0, Infinity, 0, 0, 0);
+ctx.setTransform(Infinity, 0, Infinity, Infinity, 0, 0);
+ctx.setTransform(Infinity, 0, Infinity, Infinity, Infinity, 0);
+ctx.setTransform(Infinity, 0, Infinity, Infinity, Infinity, Infinity);
+ctx.setTransform(Infinity, 0, Infinity, Infinity, 0, Infinity);
+ctx.setTransform(Infinity, 0, Infinity, 0, Infinity, 0);
+ctx.setTransform(Infinity, 0, Infinity, 0, Infinity, Infinity);
+ctx.setTransform(Infinity, 0, Infinity, 0, 0, Infinity);
+ctx.setTransform(Infinity, 0, 0, Infinity, 0, 0);
+ctx.setTransform(Infinity, 0, 0, Infinity, Infinity, 0);
+ctx.setTransform(Infinity, 0, 0, Infinity, Infinity, Infinity);
+ctx.setTransform(Infinity, 0, 0, Infinity, 0, Infinity);
+ctx.setTransform(Infinity, 0, 0, 0, Infinity, 0);
+ctx.setTransform(Infinity, 0, 0, 0, Infinity, Infinity);
+ctx.setTransform(Infinity, 0, 0, 0, 0, Infinity);
+ctx.setTransform(0, Infinity, Infinity, 0, 0, 0);
+ctx.setTransform(0, Infinity, Infinity, Infinity, 0, 0);
+ctx.setTransform(0, Infinity, Infinity, Infinity, Infinity, 0);
+ctx.setTransform(0, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.setTransform(0, Infinity, Infinity, Infinity, 0, Infinity);
+ctx.setTransform(0, Infinity, Infinity, 0, Infinity, 0);
+ctx.setTransform(0, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.setTransform(0, Infinity, Infinity, 0, 0, Infinity);
+ctx.setTransform(0, Infinity, 0, Infinity, 0, 0);
+ctx.setTransform(0, Infinity, 0, Infinity, Infinity, 0);
+ctx.setTransform(0, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.setTransform(0, Infinity, 0, Infinity, 0, Infinity);
+ctx.setTransform(0, Infinity, 0, 0, Infinity, 0);
+ctx.setTransform(0, Infinity, 0, 0, Infinity, Infinity);
+ctx.setTransform(0, Infinity, 0, 0, 0, Infinity);
+ctx.setTransform(0, 0, Infinity, Infinity, 0, 0);
+ctx.setTransform(0, 0, Infinity, Infinity, Infinity, 0);
+ctx.setTransform(0, 0, Infinity, Infinity, Infinity, Infinity);
+ctx.setTransform(0, 0, Infinity, Infinity, 0, Infinity);
+ctx.setTransform(0, 0, Infinity, 0, Infinity, 0);
+ctx.setTransform(0, 0, Infinity, 0, Infinity, Infinity);
+ctx.setTransform(0, 0, Infinity, 0, 0, Infinity);
+ctx.setTransform(0, 0, 0, Infinity, Infinity, 0);
+ctx.setTransform(0, 0, 0, Infinity, Infinity, Infinity);
+ctx.setTransform(0, 0, 0, Infinity, 0, Infinity);
+ctx.setTransform(0, 0, 0, 0, Infinity, Infinity);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -10, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.transformation.setTransform.skewed.html b/content/canvas/test/test_2d.transformation.setTransform.skewed.html
index 2dba07bfae90..91077b273e48 100644
--- a/content/canvas/test/test_2d.transformation.setTransform.skewed.html
+++ b/content/canvas/test/test_2d.transformation.setTransform.skewed.html
@@ -2,18 +2,17 @@
 <title>Canvas test: 2d.transformation.setTransform.skewed</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -56,7 +55,8 @@ isPixel(ctx, 61,19, 0,255,0,255, "61,19", "0,255,0,255", 0);
 isPixel(ctx, 39,31, 0,255,0,255, "39,31", "0,255,0,255", 0);
 isPixel(ctx, 61,31, 0,255,0,255, "61,31", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.transform.identity.html b/content/canvas/test/test_2d.transformation.transform.identity.html
index f514555edfcf..a55f37823ac5 100644
--- a/content/canvas/test/test_2d.transformation.transform.identity.html
+++ b/content/canvas/test/test_2d.transformation.transform.identity.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.transform.identity</title>
+<!-- Testing: transform() with the identity matrix does nothing -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +34,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.transform.multiply.html b/content/canvas/test/test_2d.transformation.transform.multiply.html
index 7d9720d4bc18..df43489d80c3 100644
--- a/content/canvas/test/test_2d.transformation.transform.multiply.html
+++ b/content/canvas/test/test_2d.transformation.transform.multiply.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.transform.multiply</title>
+<!-- Testing: transform() multiplies the CTM -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +35,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.transform.nonfinite.html b/content/canvas/test/test_2d.transformation.transform.nonfinite.html
new file mode 100644
index 000000000000..f9988d75d8b2
--- /dev/null
+++ b/content/canvas/test/test_2d.transformation.transform.nonfinite.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.transform.nonfinite</title>
+<!-- Testing: transform() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(100, 10);
+ctx.transform(Infinity, 0, 0, 0, 0, 0);
+ctx.transform(-Infinity, 0, 0, 0, 0, 0);
+ctx.transform(NaN, 0, 0, 0, 0, 0);
+ctx.transform(0, Infinity, 0, 0, 0, 0);
+ctx.transform(0, -Infinity, 0, 0, 0, 0);
+ctx.transform(0, NaN, 0, 0, 0, 0);
+ctx.transform(0, 0, Infinity, 0, 0, 0);
+ctx.transform(0, 0, -Infinity, 0, 0, 0);
+ctx.transform(0, 0, NaN, 0, 0, 0);
+ctx.transform(0, 0, 0, Infinity, 0, 0);
+ctx.transform(0, 0, 0, -Infinity, 0, 0);
+ctx.transform(0, 0, 0, NaN, 0, 0);
+ctx.transform(0, 0, 0, 0, Infinity, 0);
+ctx.transform(0, 0, 0, 0, -Infinity, 0);
+ctx.transform(0, 0, 0, 0, NaN, 0);
+ctx.transform(0, 0, 0, 0, 0, Infinity);
+ctx.transform(0, 0, 0, 0, 0, -Infinity);
+ctx.transform(0, 0, 0, 0, 0, NaN);
+ctx.transform(Infinity, Infinity, 0, 0, 0, 0);
+ctx.transform(Infinity, Infinity, Infinity, 0, 0, 0);
+ctx.transform(Infinity, Infinity, Infinity, Infinity, 0, 0);
+ctx.transform(Infinity, Infinity, Infinity, Infinity, Infinity, 0);
+ctx.transform(Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.transform(Infinity, Infinity, Infinity, Infinity, 0, Infinity);
+ctx.transform(Infinity, Infinity, Infinity, 0, Infinity, 0);
+ctx.transform(Infinity, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.transform(Infinity, Infinity, Infinity, 0, 0, Infinity);
+ctx.transform(Infinity, Infinity, 0, Infinity, 0, 0);
+ctx.transform(Infinity, Infinity, 0, Infinity, Infinity, 0);
+ctx.transform(Infinity, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.transform(Infinity, Infinity, 0, Infinity, 0, Infinity);
+ctx.transform(Infinity, Infinity, 0, 0, Infinity, 0);
+ctx.transform(Infinity, Infinity, 0, 0, Infinity, Infinity);
+ctx.transform(Infinity, Infinity, 0, 0, 0, Infinity);
+ctx.transform(Infinity, 0, Infinity, 0, 0, 0);
+ctx.transform(Infinity, 0, Infinity, Infinity, 0, 0);
+ctx.transform(Infinity, 0, Infinity, Infinity, Infinity, 0);
+ctx.transform(Infinity, 0, Infinity, Infinity, Infinity, Infinity);
+ctx.transform(Infinity, 0, Infinity, Infinity, 0, Infinity);
+ctx.transform(Infinity, 0, Infinity, 0, Infinity, 0);
+ctx.transform(Infinity, 0, Infinity, 0, Infinity, Infinity);
+ctx.transform(Infinity, 0, Infinity, 0, 0, Infinity);
+ctx.transform(Infinity, 0, 0, Infinity, 0, 0);
+ctx.transform(Infinity, 0, 0, Infinity, Infinity, 0);
+ctx.transform(Infinity, 0, 0, Infinity, Infinity, Infinity);
+ctx.transform(Infinity, 0, 0, Infinity, 0, Infinity);
+ctx.transform(Infinity, 0, 0, 0, Infinity, 0);
+ctx.transform(Infinity, 0, 0, 0, Infinity, Infinity);
+ctx.transform(Infinity, 0, 0, 0, 0, Infinity);
+ctx.transform(0, Infinity, Infinity, 0, 0, 0);
+ctx.transform(0, Infinity, Infinity, Infinity, 0, 0);
+ctx.transform(0, Infinity, Infinity, Infinity, Infinity, 0);
+ctx.transform(0, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.transform(0, Infinity, Infinity, Infinity, 0, Infinity);
+ctx.transform(0, Infinity, Infinity, 0, Infinity, 0);
+ctx.transform(0, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.transform(0, Infinity, Infinity, 0, 0, Infinity);
+ctx.transform(0, Infinity, 0, Infinity, 0, 0);
+ctx.transform(0, Infinity, 0, Infinity, Infinity, 0);
+ctx.transform(0, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.transform(0, Infinity, 0, Infinity, 0, Infinity);
+ctx.transform(0, Infinity, 0, 0, Infinity, 0);
+ctx.transform(0, Infinity, 0, 0, Infinity, Infinity);
+ctx.transform(0, Infinity, 0, 0, 0, Infinity);
+ctx.transform(0, 0, Infinity, Infinity, 0, 0);
+ctx.transform(0, 0, Infinity, Infinity, Infinity, 0);
+ctx.transform(0, 0, Infinity, Infinity, Infinity, Infinity);
+ctx.transform(0, 0, Infinity, Infinity, 0, Infinity);
+ctx.transform(0, 0, Infinity, 0, Infinity, 0);
+ctx.transform(0, 0, Infinity, 0, Infinity, Infinity);
+ctx.transform(0, 0, Infinity, 0, 0, Infinity);
+ctx.transform(0, 0, 0, Infinity, Infinity, 0);
+ctx.transform(0, 0, 0, Infinity, Infinity, Infinity);
+ctx.transform(0, 0, 0, Infinity, 0, Infinity);
+ctx.transform(0, 0, 0, 0, Infinity, Infinity);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -10, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.transformation.transform.skewed.html b/content/canvas/test/test_2d.transformation.transform.skewed.html
index 152ac581d491..22703a50329f 100644
--- a/content/canvas/test/test_2d.transformation.transform.skewed.html
+++ b/content/canvas/test/test_2d.transformation.transform.skewed.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.transform.skewed</title>
+<!-- Testing: transform() with skewy matrix transforms correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -56,7 +56,8 @@ isPixel(ctx, 61,19, 0,255,0,255, "61,19", "0,255,0,255", 0);
 isPixel(ctx, 39,31, 0,255,0,255, "39,31", "0,255,0,255", 0);
 isPixel(ctx, 61,31, 0,255,0,255, "61,31", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.translate.basic.html b/content/canvas/test/test_2d.transformation.translate.basic.html
index 7e9ef161bdd0..7de51a7bbb85 100644
--- a/content/canvas/test/test_2d.transformation.translate.basic.html
+++ b/content/canvas/test/test_2d.transformation.translate.basic.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.transformation.translate.basic</title>
+<!-- Testing: translate() works -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +34,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(-100, -50, 100, 50);
 isPixel(ctx, 90,40, 0,255,0,255, "90,40", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.translate.nonfinite.html b/content/canvas/test/test_2d.transformation.translate.nonfinite.html
new file mode 100644
index 000000000000..456842e8c4fa
--- /dev/null
+++ b/content/canvas/test/test_2d.transformation.translate.nonfinite.html
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.translate.nonfinite</title>
+<!-- Testing: translate() with Infinity/NaN is ignored -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(100, 10);
+ctx.translate(Infinity, 0.1);
+ctx.translate(-Infinity, 0.1);
+ctx.translate(NaN, 0.1);
+ctx.translate(0.1, Infinity);
+ctx.translate(0.1, -Infinity);
+ctx.translate(0.1, NaN);
+ctx.translate(Infinity, Infinity);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -10, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_2d.type.delete.html b/content/canvas/test/test_2d.type.delete.html
index f5792d242b15..bd4d9d68bad0 100644
--- a/content/canvas/test/test_2d.type.delete.html
+++ b/content/canvas/test/test_2d.type.delete.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.type.delete</title>
+<!-- Testing: window.CanvasRenderingContext2D is DontDelete -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +17,8 @@ var ctx = canvas.getContext('2d');
 delete window.CanvasRenderingContext2D;
 ok(window.CanvasRenderingContext2D !== undefined, "window.CanvasRenderingContext2D !== undefined");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.type.exists.html b/content/canvas/test/test_2d.type.exists.html
index ea88ed25b59b..2ef3167c1ae8 100644
--- a/content/canvas/test/test_2d.type.exists.html
+++ b/content/canvas/test/test_2d.type.exists.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.type.exists</title>
+<!-- Testing: The 2D context interface is a property of 'window' -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(window.CanvasRenderingContext2D, "window.CanvasRenderingContext2D");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.type.extend.html b/content/canvas/test/test_2d.type.extend.html
index da92d0f2ad2f..f7d62c2bca41 100644
--- a/content/canvas/test/test_2d.type.extend.html
+++ b/content/canvas/test/test_2d.type.extend.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.type.extend</title>
+<!-- Testing: Interface methods can be added -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -35,7 +35,8 @@ ctx.fillStyle = '#f00';
 ctx.fillRectGreen(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.type.prototype.html b/content/canvas/test/test_2d.type.prototype.html
index 6af8fedda4ba..29c451414579 100644
--- a/content/canvas/test/test_2d.type.prototype.html
+++ b/content/canvas/test/test_2d.type.prototype.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.type.prototype</title>
+<!-- Testing: window.CanvasRenderingContext2D.prototype is { DontDelete, ReadOnly }, and its methods are not -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -25,7 +25,8 @@ ok(window.CanvasRenderingContext2D.prototype.fill === 1, "window.CanvasRendering
 delete window.CanvasRenderingContext2D.prototype.fill;
 todo(window.CanvasRenderingContext2D.prototype.fill === undefined, "window.CanvasRenderingContext2D.prototype.fill === undefined");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.type.replace.html b/content/canvas/test/test_2d.type.replace.html
index 8a37d4106eb4..f77b1df387c6 100644
--- a/content/canvas/test/test_2d.type.replace.html
+++ b/content/canvas/test/test_2d.type.replace.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.type.replace</title>
+<!-- Testing: Interface methods can be overridden -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -36,7 +36,8 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.voidreturn.html b/content/canvas/test/test_2d.voidreturn.html
index 12fbaeb12b80..11123f8001f8 100644
--- a/content/canvas/test/test_2d.voidreturn.html
+++ b/content/canvas/test/test_2d.voidreturn.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: 2d.voidreturn</title>
+<!-- Testing: void methods return undefined -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -47,7 +47,8 @@ ok(ctx.drawImage(document.getElementById('yellow.png'), 0, 0, 0, 0, 0, 0, 0, 0)
 ok(ctx.drawImage(canvas, 0, 0, 0, 0, 0, 0, 0, 0) === undefined, "ctx.drawImage(canvas, 0, 0, 0, 0, 0, 0, 0, 0) === undefined");
 ok(ctx.createLinearGradient(0, 0, 0, 0).addColorStop(0, 'white') === undefined, "ctx.createLinearGradient(0, 0, 0, 0).addColorStop(0, 'white') === undefined");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 <img src="image_yellow.png" id="yellow.png" class="resource">
diff --git a/content/canvas/test/test_2d.type.name.html b/content/canvas/test/test_context.arguments.extra.html
similarity index 54%
rename from content/canvas/test/test_2d.type.name.html
rename to content/canvas/test/test_context.arguments.extra.html
index 6e3d33b4ee14..866dea1b65f6 100644
--- a/content/canvas/test/test_2d.type.name.html
+++ b/content/canvas/test/test_context.arguments.extra.html
@@ -1,12 +1,11 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.type.name</title>
+<title>Canvas test: context.arguments.extra</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -14,9 +13,10 @@ MochiKit.DOM.addLoadEvent(function () {
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
-ok(Object.prototype.toString.call(ctx) === '[object CanvasRenderingContext2D]', "Object.prototype.toString.call(ctx) === '[object CanvasRenderingContext2D]'");
+ok(canvas.getContext('2d', 'foo') !== null, "canvas.getContext('2d', 'foo') !== null");
+
+SimpleTest.finish();
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_2d.transformation.rotate.nan.html b/content/canvas/test/test_context.arguments.missing.html
similarity index 72%
rename from content/canvas/test/test_2d.transformation.rotate.nan.html
rename to content/canvas/test/test_context.arguments.missing.html
index 11d6c3eddc96..7c8a57a66393 100644
--- a/content/canvas/test/test_2d.transformation.rotate.nan.html
+++ b/content/canvas/test/test_context.arguments.missing.html
@@ -1,12 +1,11 @@
 <!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.rotate.nan</title>
+<title>Canvas test: context.arguments.missing</title>
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -15,10 +14,11 @@ var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');
 
 var _thrown = undefined; try {
-  ctx.rotate(NaN);
+  canvas.getContext();
 } catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_context.casesensitive.html b/content/canvas/test/test_context.casesensitive.html
new file mode 100644
index 000000000000..2e51e62fc987
--- /dev/null
+++ b/content/canvas/test/test_context.casesensitive.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: context.casesensitive - bug 401788</title>
+<!-- Testing: Context name "2D" is unrecognised; matching is case sensitive -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ok(canvas.getContext('2D') === null, "canvas.getContext('2D') === null");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_context.emptystring.html b/content/canvas/test/test_context.emptystring.html
new file mode 100644
index 000000000000..eda3b3553e88
--- /dev/null
+++ b/content/canvas/test/test_context.emptystring.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: context.emptystring - bug 401788</title>
+<!-- Testing: getContext with empty string returns null -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ok(canvas.getContext("") === null, "canvas.getContext(\"\") === null");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_context.unrecognised.badname.html b/content/canvas/test/test_context.unrecognised.badname.html
new file mode 100644
index 000000000000..bbeb572df8e1
--- /dev/null
+++ b/content/canvas/test/test_context.unrecognised.badname.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: context.unrecognised.badname - bug 401788</title>
+<!-- Testing: getContext with unrecognised context name returns null -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ok(canvas.getContext('This is not an implemented context in any real browser') === null, "canvas.getContext('This is not an implemented context in any real browser') === null");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_context.unrecognised.badsuffix.html b/content/canvas/test/test_context.unrecognised.badsuffix.html
new file mode 100644
index 000000000000..dbf98a52c9b0
--- /dev/null
+++ b/content/canvas/test/test_context.unrecognised.badsuffix.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: context.unrecognised.badsuffix - bug 401788</title>
+<!-- Testing: Context name "2d" plus a suffix is unrecognised -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ok(canvas.getContext("2d#") === null, "canvas.getContext(\"2d#\") === null");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_context.unrecognised.nullsuffix.html b/content/canvas/test/test_context.unrecognised.nullsuffix.html
new file mode 100644
index 000000000000..522049754dda
--- /dev/null
+++ b/content/canvas/test/test_context.unrecognised.nullsuffix.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: context.unrecognised.nullsuffix - bug 401788</title>
+<!-- Testing: Context name "2d" plus a "\0" suffix is unrecognised -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ok(canvas.getContext("2d\0") === null, "canvas.getContext(\"2d\\0\") === null");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_context.unrecognised.unicode.html b/content/canvas/test/test_context.unrecognised.unicode.html
new file mode 100644
index 000000000000..9d33ba5ead59
--- /dev/null
+++ b/content/canvas/test/test_context.unrecognised.unicode.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: context.unrecognised.unicode - bug 401788</title>
+<!-- Testing: Context name which kind of looks like "2d" is unrecognised -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ok(canvas.getContext("2\uFF44") === null, "canvas.getContext(\"2\\uFF44\") === null"); // Fullwidth Latin Small Letter D
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_fallback.basic.html b/content/canvas/test/test_fallback.basic.html
index b516fd41452a..2a5df7489747 100644
--- a/content/canvas/test/test_fallback.basic.html
+++ b/content/canvas/test/test_fallback.basic.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: fallback.basic</title>
+<!-- Testing: Fallback content is inserted into the DOM -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(canvas.childNodes.length == 1, "canvas.childNodes.length == 1");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_fallback.multiple.html b/content/canvas/test/test_fallback.multiple.html
index 30264eef9b95..9970ad6ed251 100644
--- a/content/canvas/test/test_fallback.multiple.html
+++ b/content/canvas/test/test_fallback.multiple.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: fallback.multiple</title>
+<!-- Testing: Fallback content with multiple elements -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL</p><p class="fallback">FAIL</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(canvas.childNodes.length == 2, "canvas.childNodes.length == 2");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_fallback.nested.html b/content/canvas/test/test_fallback.nested.html
index 80ad77053b21..b998ccd96468 100644
--- a/content/canvas/test/test_fallback.nested.html
+++ b/content/canvas/test/test_fallback.nested.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: fallback.nested</title>
+<!-- Testing: Fallback content containing another canvas (mostly testing parsers) -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><canvas><p class="fallback">FAIL (fallback content)</p></canvas><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(canvas.childNodes.length == 2, "canvas.childNodes.length == 2");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_initial.colour.html b/content/canvas/test/test_initial.colour.html
index 7b0c9ce68e9c..b5796baa590a 100644
--- a/content/canvas/test/test_initial.colour.html
+++ b/content/canvas/test/test_initial.colour.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: initial.colour</title>
+<!-- Testing: Initial state is transparent black -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -28,7 +28,8 @@ var ctx = canvas.getContext('2d');
 
 isPixel(ctx, 20,20, 0,0,0,0, "20,20", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_initial.reset.2dstate.html b/content/canvas/test/test_initial.reset.2dstate.html
index 6b1ac189cc92..91985572ae03 100644
--- a/content/canvas/test/test_initial.reset.2dstate.html
+++ b/content/canvas/test/test_initial.reset.2dstate.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: initial.reset.2dstate</title>
+<!-- Testing: Resetting the canvas state resets 2D state variables -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -77,7 +77,8 @@ ctx.globalCompositeOperation = "copy";
 canvas.width = 100;
 ok(ctx.globalCompositeOperation === default_val, "ctx.globalCompositeOperation === default_val");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_initial.reset.clip.html b/content/canvas/test/test_initial.reset.clip.html
index 451469cc9c1e..a6b4dcc657a8 100644
--- a/content/canvas/test/test_initial.reset.clip.html
+++ b/content/canvas/test/test_initial.reset.clip.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: initial.reset.clip</title>
+<!-- Testing: Resetting the canvas state resets the current clip region -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -34,7 +34,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 20,20, 0,255,0,255, "20,20", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_initial.reset.different.html b/content/canvas/test/test_initial.reset.different.html
index 43d9bfb84e0e..48f9f66b5897 100644
--- a/content/canvas/test/test_initial.reset.different.html
+++ b/content/canvas/test/test_initial.reset.different.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: initial.reset.different</title>
+<!-- Testing: Changing size resets canvas to transparent black -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -32,7 +32,8 @@ isPixel(ctx, 20,20, 255,0,0,255, "20,20", "255,0,0,255", 0);
 canvas.width = 50;
 isPixel(ctx, 20,20, 0,0,0,0, "20,20", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_initial.reset.gradient.html b/content/canvas/test/test_initial.reset.gradient.html
index 27783aeee091..d8fbe4b68743 100644
--- a/content/canvas/test/test_initial.reset.gradient.html
+++ b/content/canvas/test/test_initial.reset.gradient.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: initial.reset.gradient</title>
+<!-- Testing: Resetting the canvas state does not invalidate any existing gradients -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -37,7 +37,8 @@ ctx.fillStyle = g;
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_initial.reset.path.html b/content/canvas/test/test_initial.reset.path.html
index bc080a04b8c7..dd472c4e92ad 100644
--- a/content/canvas/test/test_initial.reset.path.html
+++ b/content/canvas/test/test_initial.reset.path.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: initial.reset.path</title>
+<!-- Testing: Resetting the canvas state resets the current path -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +33,8 @@ ctx.fillStyle = '#f00';
 ctx.fill();
 isPixel(ctx, 20,20, 0,0,0,0, "20,20", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_initial.reset.pattern.html b/content/canvas/test/test_initial.reset.pattern.html
index 4223e06f50ee..0f0f8317f1a2 100644
--- a/content/canvas/test/test_initial.reset.pattern.html
+++ b/content/canvas/test/test_initial.reset.pattern.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: initial.reset.pattern</title>
+<!-- Testing: Resetting the canvas state does not invalidate any existing patterns -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -37,7 +37,8 @@ ctx.fillStyle = p;
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_initial.reset.same.html b/content/canvas/test/test_initial.reset.same.html
index 07d65be31bcd..2cb7bdd38645 100644
--- a/content/canvas/test/test_initial.reset.same.html
+++ b/content/canvas/test/test_initial.reset.same.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: initial.reset.same</title>
+<!-- Testing: Setting size (not changing the value) resets canvas to transparent black -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +33,8 @@ isPixel(ctx, 20,20, 255,0,0,255, "20,20", "255,0,0,255", 0);
 canvas.width = 100;
 isPixel(ctx, 20,20, 0,0,0,0, "20,20", "0,0,0,0", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_initial.reset.transform.html b/content/canvas/test/test_initial.reset.transform.html
index 2373d0f40351..9194311ad164 100644
--- a/content/canvas/test/test_initial.reset.transform.html
+++ b/content/canvas/test/test_initial.reset.transform.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: initial.reset.transform</title>
+<!-- Testing: Resetting the canvas state resets the current transformation matrix -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -33,7 +33,8 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 20,20, 0,255,0,255, "20,20", "0,255,0,255", 0);
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.default.html b/content/canvas/test/test_size.attributes.default.html
index 3f044a57fc2c..99bea024cee0 100644
--- a/content/canvas/test/test_size.attributes.default.html
+++ b/content/canvas/test/test_size.attributes.default.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.default</title>
+<!-- Testing: Default width/height -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" ><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -19,7 +19,8 @@ ok(canvas.height == 150, "canvas.height == 150");
 ok(!canvas.hasAttribute('width'), "!canvas.hasAttribute('width')");
 ok(!canvas.hasAttribute('height'), "!canvas.hasAttribute('height')");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.html b/content/canvas/test/test_size.attributes.html
index a7105ef8a78e..078d10241c6b 100644
--- a/content/canvas/test/test_size.attributes.html
+++ b/content/canvas/test/test_size.attributes.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes</title>
+<!-- Testing: width/height DOM attributes and content attributes -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="120" height="60"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -19,7 +19,8 @@ ok(canvas.height == 60, "canvas.height == 60");
 ok(canvas.getAttribute('width') == 120, "canvas.getAttribute('width') == 120");
 ok(canvas.getAttribute('height') == 60, "canvas.getAttribute('height') == 60");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.parse.badsuffix.html b/content/canvas/test/test_size.attributes.parse.badsuffix.html
index fd4f298ea975..e478f3586552 100644
--- a/content/canvas/test/test_size.attributes.parse.badsuffix.html
+++ b/content/canvas/test/test_size.attributes.parse.badsuffix.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.parse.badsuffix</title>
+<!-- Testing: Parsing of non-negative integers -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100foo" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 todo(canvas.width == 100, "canvas.width == 100");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.parse.floatsuffix.html b/content/canvas/test/test_size.attributes.parse.floatsuffix.html
index b70fa853a0bf..9bc489ed622d 100644
--- a/content/canvas/test/test_size.attributes.parse.floatsuffix.html
+++ b/content/canvas/test/test_size.attributes.parse.floatsuffix.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.parse.floatsuffix</title>
+<!-- Testing: Parsing of non-negative integers -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100.9" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(canvas.width == 100, "canvas.width == 100");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.parse.negative.html b/content/canvas/test/test_size.attributes.parse.negative.html
index a233ae45469a..3e9128ba2d1d 100644
--- a/content/canvas/test/test_size.attributes.parse.negative.html
+++ b/content/canvas/test/test_size.attributes.parse.negative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.parse.negative</title>
+<!-- Testing: Parsing of non-negative integers -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="-100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 todo(canvas.width == 300, "canvas.width == 300");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.parse.nonnumber.html b/content/canvas/test/test_size.attributes.parse.nonnumber.html
index 449b2a104854..76f36477af71 100644
--- a/content/canvas/test/test_size.attributes.parse.nonnumber.html
+++ b/content/canvas/test/test_size.attributes.parse.nonnumber.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.parse.nonnumber</title>
+<!-- Testing: Parsing of non-negative integers -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="foo" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(canvas.width == 300, "canvas.width == 300");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.parse.percentsuffix.html b/content/canvas/test/test_size.attributes.parse.percentsuffix.html
index e667161a7dcd..c10a85bf9559 100644
--- a/content/canvas/test/test_size.attributes.parse.percentsuffix.html
+++ b/content/canvas/test/test_size.attributes.parse.percentsuffix.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.parse.percentsuffix</title>
+<!-- Testing: Parsing of non-negative integers -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100%" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(canvas.width == 100, "canvas.width == 100");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.parse.whitespace.html b/content/canvas/test/test_size.attributes.parse.whitespace.html
index fccba51036ac..81492acfc0e4 100644
--- a/content/canvas/test/test_size.attributes.parse.whitespace.html
+++ b/content/canvas/test/test_size.attributes.parse.whitespace.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.parse.whitespace</title>
+<!-- Testing: Parsing of non-negative integers -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="   100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(canvas.width == 100, "canvas.width == 100");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.parse.zero.html b/content/canvas/test/test_size.attributes.parse.zero.html
index ba62a83d809d..3f62c72f9475 100644
--- a/content/canvas/test/test_size.attributes.parse.zero.html
+++ b/content/canvas/test/test_size.attributes.parse.zero.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.parse.zero</title>
+<!-- Testing: Parsing of non-negative integers -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="0" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(canvas.width == 0, "canvas.width == 0");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.parse.zerosuffix.html b/content/canvas/test/test_size.attributes.parse.zerosuffix.html
index 4a1045d66b83..7fbb8bc3a2ef 100644
--- a/content/canvas/test/test_size.attributes.parse.zerosuffix.html
+++ b/content/canvas/test/test_size.attributes.parse.zerosuffix.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.parse.zerosuffix</title>
+<!-- Testing: Parsing of non-negative integers -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100.0" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(canvas.width == 100, "canvas.width == 100");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.reflect.1.html b/content/canvas/test/test_size.attributes.reflect.1.html
index d737dc06c3f3..a354dfcff26c 100644
--- a/content/canvas/test/test_size.attributes.reflect.1.html
+++ b/content/canvas/test/test_size.attributes.reflect.1.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.reflect.1</title>
+<!-- Testing: Setting DOM attributes updates DOM and content attributes -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -21,7 +21,8 @@ ok(canvas.getAttribute('height') == '60', "canvas.getAttribute('height') == '60'
 ok(canvas.width == 120, "canvas.width == 120");
 ok(canvas.height == 60, "canvas.height == 60");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.reflect.2.html b/content/canvas/test/test_size.attributes.reflect.2.html
index 1071eacecb26..d540adbf2bfe 100644
--- a/content/canvas/test/test_size.attributes.reflect.2.html
+++ b/content/canvas/test/test_size.attributes.reflect.2.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.reflect.2</title>
+<!-- Testing: Setting content attributes updates DOM and content attributes -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -21,7 +21,8 @@ ok(canvas.getAttribute('height') == '60', "canvas.getAttribute('height') == '60'
 ok(canvas.width == 120, "canvas.width == 120");
 ok(canvas.height == 60, "canvas.height == 60");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.removed.html b/content/canvas/test/test_size.attributes.removed.html
index f0fda3301009..5013213d3670 100644
--- a/content/canvas/test/test_size.attributes.removed.html
+++ b/content/canvas/test/test_size.attributes.removed.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.removed</title>
+<!-- Testing: Removing content attributes reverts to default size -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="120" height="60"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +17,8 @@ var ctx = canvas.getContext('2d');
 canvas.removeAttribute('width');
 ok(canvas.width == 300, "canvas.width == 300");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.setAttribute.badsuffix.html b/content/canvas/test/test_size.attributes.setAttribute.badsuffix.html
index e3e1e387fd00..3a278f48717b 100644
--- a/content/canvas/test/test_size.attributes.setAttribute.badsuffix.html
+++ b/content/canvas/test/test_size.attributes.setAttribute.badsuffix.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.setAttribute.badsuffix</title>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +17,8 @@ var ctx = canvas.getContext('2d');
 canvas.setAttribute('width', '100foo');
 todo(canvas.width == 100, "canvas.width == 100");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.setAttribute.floatsuffix.html b/content/canvas/test/test_size.attributes.setAttribute.floatsuffix.html
index 28d2ead88978..1f7af85ffa4d 100644
--- a/content/canvas/test/test_size.attributes.setAttribute.floatsuffix.html
+++ b/content/canvas/test/test_size.attributes.setAttribute.floatsuffix.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.setAttribute.floatsuffix</title>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -18,7 +18,8 @@ canvas.setAttribute('width', '1');
 canvas.setAttribute('width', '100.9');
 ok(canvas.width == 100, "canvas.width == 100");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.setAttribute.negative.html b/content/canvas/test/test_size.attributes.setAttribute.negative.html
index d6a0b3979f28..9fc470017f54 100644
--- a/content/canvas/test/test_size.attributes.setAttribute.negative.html
+++ b/content/canvas/test/test_size.attributes.setAttribute.negative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.setAttribute.negative</title>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +17,8 @@ var ctx = canvas.getContext('2d');
 canvas.setAttribute('width', '-100');
 todo(canvas.width == 300, "canvas.width == 300");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.setAttribute.nonnumber.html b/content/canvas/test/test_size.attributes.setAttribute.nonnumber.html
index 59b18660ca0d..061d08df6774 100644
--- a/content/canvas/test/test_size.attributes.setAttribute.nonnumber.html
+++ b/content/canvas/test/test_size.attributes.setAttribute.nonnumber.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.setAttribute.nonnumber</title>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +17,8 @@ var ctx = canvas.getContext('2d');
 canvas.setAttribute('width', 'foo');
 ok(canvas.width == 300, "canvas.width == 300");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.setAttribute.percentsuffix.html b/content/canvas/test/test_size.attributes.setAttribute.percentsuffix.html
index c128465b3429..6a67c491ad8c 100644
--- a/content/canvas/test/test_size.attributes.setAttribute.percentsuffix.html
+++ b/content/canvas/test/test_size.attributes.setAttribute.percentsuffix.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.setAttribute.percentsuffix</title>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +17,8 @@ var ctx = canvas.getContext('2d');
 canvas.setAttribute('width', '100%');
 ok(canvas.width == 100, "canvas.width == 100");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.setAttribute.whitespace.html b/content/canvas/test/test_size.attributes.setAttribute.whitespace.html
index d8a73c97b511..d239db59336c 100644
--- a/content/canvas/test/test_size.attributes.setAttribute.whitespace.html
+++ b/content/canvas/test/test_size.attributes.setAttribute.whitespace.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.setAttribute.whitespace</title>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +17,8 @@ var ctx = canvas.getContext('2d');
 canvas.setAttribute('width', '   100');
 ok(canvas.width == 100, "canvas.width == 100");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.setAttribute.zero.html b/content/canvas/test/test_size.attributes.setAttribute.zero.html
index 5f7f377610ba..38108cdcecba 100644
--- a/content/canvas/test/test_size.attributes.setAttribute.zero.html
+++ b/content/canvas/test/test_size.attributes.setAttribute.zero.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.setAttribute.zero</title>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +17,8 @@ var ctx = canvas.getContext('2d');
 canvas.setAttribute('width', '0');
 ok(canvas.width == 0, "canvas.width == 0");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.setAttribute.zerosuffix.html b/content/canvas/test/test_size.attributes.setAttribute.zerosuffix.html
index 491d94043a89..180a4db9fbf8 100644
--- a/content/canvas/test/test_size.attributes.setAttribute.zerosuffix.html
+++ b/content/canvas/test/test_size.attributes.setAttribute.zerosuffix.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.setAttribute.zerosuffix</title>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -18,7 +18,8 @@ canvas.setAttribute('width', '1');
 canvas.setAttribute('width', '100.0');
 ok(canvas.width == 100, "canvas.width == 100");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.style.html b/content/canvas/test/test_size.attributes.style.html
index df8c08ca14e4..09b653c6a29d 100644
--- a/content/canvas/test/test_size.attributes.style.html
+++ b/content/canvas/test/test_size.attributes.style.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.style</title>
+<!-- Testing: Canvas size is independent of CSS resizing -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="50" height="30" style="width: 100px; height: 50px"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +17,8 @@ var ctx = canvas.getContext('2d');
 ok(canvas.width == 50, "canvas.width == 50");
 ok(canvas.height == 30, "canvas.height == 30");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.type.get.html b/content/canvas/test/test_size.attributes.type.get.html
index 52cac98d555a..a6e092b0844e 100644
--- a/content/canvas/test/test_size.attributes.type.get.html
+++ b/content/canvas/test/test_size.attributes.type.get.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.type.get</title>
+<!-- Testing: width/height DOM/content attributes - string vs number types -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="120" height="60"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -19,7 +19,8 @@ ok(canvas.height === 60, "canvas.height === 60");
 ok(canvas.getAttribute('width') === '120', "canvas.getAttribute('width') === '120'");
 ok(canvas.getAttribute('height') === '60', "canvas.getAttribute('height') === '60'");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_size.attributes.type.set.html b/content/canvas/test/test_size.attributes.type.set.html
index a09ae3527083..855b03b923d8 100644
--- a/content/canvas/test/test_size.attributes.type.set.html
+++ b/content/canvas/test/test_size.attributes.type.set.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: size.attributes.type.set</title>
+<!-- Testing: Setting width/height DOM attributes -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -19,7 +19,8 @@ canvas.height = 60;
 ok(canvas.width === 120, "canvas.width === 120");
 ok(canvas.height === 60, "canvas.height === 60");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_toDataURL.arguments.1.html b/content/canvas/test/test_toDataURL.arguments.1.html
new file mode 100644
index 000000000000..5d010b796adc
--- /dev/null
+++ b/content/canvas/test/test_toDataURL.arguments.1.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<title>Canvas test: toDataURL.arguments.1 - bug 401795</title>
+<!-- Testing: toDataURL ignores extra arguments -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var data = canvas.toDataURL('image/png', 'another argument that should not raise an exception');
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_toDataURL.arguments.2.html b/content/canvas/test/test_toDataURL.arguments.2.html
new file mode 100644
index 000000000000..20d16383acad
--- /dev/null
+++ b/content/canvas/test/test_toDataURL.arguments.2.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<title>Canvas test: toDataURL.arguments.2 - bug 401795</title>
+<!-- Testing: toDataURL ignores extra arguments -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var data = canvas.toDataURL('image/png', 'another argument that should not raise an exception', 'and another');
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_toDataURL.arguments.3.html b/content/canvas/test/test_toDataURL.arguments.3.html
new file mode 100644
index 000000000000..2999d24f81d0
--- /dev/null
+++ b/content/canvas/test/test_toDataURL.arguments.3.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML>
+<title>Canvas test: toDataURL.arguments.3 - bug 401795</title>
+<!-- Testing: toDataURL ignores extra arguments -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+// More arguments that should not raise exceptions
+var data = canvas.toDataURL('image/png', null, null, null);
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_toDataURL.complexcolours.html b/content/canvas/test/test_toDataURL.complexcolours.html
index 5bf07d04e898..9a04b4150240 100644
--- a/content/canvas/test/test_toDataURL.complexcolours.html
+++ b/content/canvas/test/test_toDataURL.complexcolours.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: toDataURL.complexcolours</title>
+<!-- Testing: toDataURL handles non-primary and non-solid colours correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -59,7 +59,7 @@ img.onload = wrapFunction(function ()
 });
 img.src = canvas.toDataURL();
 
-if (!_deferred) SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_toDataURL.default.html b/content/canvas/test/test_toDataURL.default.html
index 4141f08936fc..aec691496b25 100644
--- a/content/canvas/test/test_toDataURL.default.html
+++ b/content/canvas/test/test_toDataURL.default.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: toDataURL.default</title>
+<!-- Testing: toDataURL with no arguments returns a PNG -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +17,8 @@ var ctx = canvas.getContext('2d');
 var data = canvas.toDataURL();
 ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_toDataURL.lowercase.html b/content/canvas/test/test_toDataURL.lowercase.html
new file mode 100644
index 000000000000..04e7267c8b8c
--- /dev/null
+++ b/content/canvas/test/test_toDataURL.lowercase.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<title>Canvas test: toDataURL.lowercase - bug 401795</title>
+<!-- Testing: toDataURL type is case-sensitive -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var data = canvas.toDataURL('ImAgE/PnG');
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_toDataURL.nocontext.html b/content/canvas/test/test_toDataURL.nocontext.html
index e0e919be31a6..ea43a098dd93 100644
--- a/content/canvas/test/test_toDataURL.nocontext.html
+++ b/content/canvas/test/test_toDataURL.nocontext.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: toDataURL.nocontext</title>
+<!-- Testing: toDataURL works before any context has been got -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -18,7 +18,8 @@ var canvas2 = document.createElement('canvas');
 var data = canvas2.toDataURL();
 ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_toDataURL.png.html b/content/canvas/test/test_toDataURL.png.html
index 8a13c1fd8cc6..ea6d00fc866d 100644
--- a/content/canvas/test/test_toDataURL.png.html
+++ b/content/canvas/test/test_toDataURL.png.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: toDataURL.png</title>
+<!-- Testing: toDataURL with image/png returns a PNG -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +17,8 @@ var ctx = canvas.getContext('2d');
 var data = canvas.toDataURL('image/png');
 ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_toDataURL.primarycolours.html b/content/canvas/test/test_toDataURL.primarycolours.html
index 178db63331d7..1ca5f8798ba9 100644
--- a/content/canvas/test/test_toDataURL.primarycolours.html
+++ b/content/canvas/test/test_toDataURL.primarycolours.html
@@ -1,19 +1,19 @@
 <!DOCTYPE HTML>
 <title>Canvas test: toDataURL.primarycolours</title>
+<!-- Testing: toDataURL handles simple colours correctly -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d, f) {
+function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
     var pixel = ctx.getImageData(x, y, 1, 1);
     var pr = pixel.data[0],
         pg = pixel.data[1],
         pb = pixel.data[2],
         pa = pixel.data[3];
-    (f || ok)(r-d <= pr && pr <= r+d &&
+    ok(r-d <= pr && pr <= r+d &&
        g-d <= pg && pg <= g+d &&
        b-d <= pb && pb <= b+d &&
        a-d <= pa && pa <= a+d,
@@ -43,12 +43,13 @@ ctx.fillStyle = '#00f';
 ctx.fillRect(75, 0, 25, 40);
 ctx.fillStyle = '#fff';
 ctx.fillRect(0, 40, 100, 10);
+var data = canvas.toDataURL();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
 var img = new Image();
 deferTest();
 img.onload = wrapFunction(function ()
 {
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50);
     ctx.drawImage(img, 0, 0);
     netscape.security.PrivilegeManager.enablePrivilege('UniversalBrowserRead');
     isPixel(ctx, 12,20, 255,255,0,255, "12,20", "255,255,0,255", 0);
@@ -56,9 +57,9 @@ img.onload = wrapFunction(function ()
     isPixel(ctx, 87,20, 0,0,255,255, "87,20", "0,0,255,255", 0);
     isPixel(ctx, 50,45, 255,255,255,255, "50,45", "255,255,255,255", 0);
 });
-img.src = canvas.toDataURL();
+img.src = data;
+
 
-if (!_deferred) SimpleTest.finish();
 });
 </script>
 
diff --git a/content/canvas/test/test_toDataURL.unrecognised.html b/content/canvas/test/test_toDataURL.unrecognised.html
new file mode 100644
index 000000000000..fc9c4ab9f48e
--- /dev/null
+++ b/content/canvas/test/test_toDataURL.unrecognised.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<title>Canvas test: toDataURL.unrecognised - bug 401795</title>
+<!-- Testing: toDataURL with an unhandled type returns a PNG -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var data = canvas.toDataURL('image/example');
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_toDataURL.zerosize.html b/content/canvas/test/test_toDataURL.zerosize.html
new file mode 100644
index 000000000000..e989d3a4899e
--- /dev/null
+++ b/content/canvas/test/test_toDataURL.zerosize.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<title>Canvas test: toDataURL.zerosize</title>
+<!-- Testing: toDataURL on zero-size canvas returns 'data:,' -->
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<canvas id="c" width="0" height="0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+MochiKit.DOM.addLoadEvent(function () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var data = canvas.toDataURL();
+todo(data === 'data:,', "data === 'data:,'");
+
+SimpleTest.finish();
+
+});
+</script>
+
diff --git a/content/canvas/test/test_type.delete.html b/content/canvas/test/test_type.delete.html
index 053ca2cd4186..b8291ee75ddd 100644
--- a/content/canvas/test/test_type.delete.html
+++ b/content/canvas/test/test_type.delete.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: type.delete</title>
+<!-- Testing: window.HTMLCanvasElement interface object is DontDelete -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +17,8 @@ var ctx = canvas.getContext('2d');
 delete window.HTMLCanvasElement;
 ok(window.HTMLCanvasElement, "window.HTMLCanvasElement");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_type.exists.html b/content/canvas/test/test_type.exists.html
index 6e03f2e286e7..62c0869301c0 100644
--- a/content/canvas/test/test_type.exists.html
+++ b/content/canvas/test/test_type.exists.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: type.exists</title>
+<!-- Testing: HTMLCanvasElement is a property of window -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(window.HTMLCanvasElement, "window.HTMLCanvasElement");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_type.extend.html b/content/canvas/test/test_type.extend.html
index 2da49f618489..f184a4eb9c31 100644
--- a/content/canvas/test/test_type.extend.html
+++ b/content/canvas/test/test_type.extend.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: type.extend</title>
+<!-- Testing: HTMLCanvasElement methods can be added, and the new methods used by canvases -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +17,8 @@ var ctx = canvas.getContext('2d');
 window.HTMLCanvasElement.prototype.getZero = function () { return 0; };
 ok(canvas.getZero() === 0, "canvas.getZero() === 0");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_type.name.html b/content/canvas/test/test_type.name.html
index 423152fd142d..e44d34adbc7d 100644
--- a/content/canvas/test/test_type.name.html
+++ b/content/canvas/test/test_type.name.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: type.name</title>
+<!-- Testing: HTMLCanvasElement type and toString -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -16,7 +16,8 @@ var ctx = canvas.getContext('2d');
 
 ok(Object.prototype.toString.call(canvas) === '[object HTMLCanvasElement]', "Object.prototype.toString.call(canvas) === '[object HTMLCanvasElement]'");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_type.prototype.html b/content/canvas/test/test_type.prototype.html
index 395e8ca48650..859dab34ea84 100644
--- a/content/canvas/test/test_type.prototype.html
+++ b/content/canvas/test/test_type.prototype.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: type.prototype</title>
+<!-- Testing: window.HTMLCanvasElement has prototype, which is { ReadOnly, DontDelete }. prototype has getContext, which is not -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -25,7 +25,8 @@ ok(window.HTMLCanvasElement.prototype.getContext === 1, "window.HTMLCanvasElemen
 delete window.HTMLCanvasElement.prototype.getContext;
 todo(window.HTMLCanvasElement.prototype.getContext === undefined, "window.HTMLCanvasElement.prototype.getContext === undefined");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>
 
diff --git a/content/canvas/test/test_type.replace.html b/content/canvas/test/test_type.replace.html
index 2714d0a4a5b2..258c7f4045ee 100644
--- a/content/canvas/test/test_type.replace.html
+++ b/content/canvas/test/test_type.replace.html
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML>
 <title>Canvas test: type.replace</title>
+<!-- Testing: HTMLCanvasElement methods can be replaced, and the replacement methods used by canvases -->
 <script src="/MochiKit/MochiKit.js"></script>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
-var _deferred = false;
 
 SimpleTest.waitForExplicitFinish();
 MochiKit.DOM.addLoadEvent(function () {
@@ -17,7 +17,8 @@ var ctx = canvas.getContext('2d');
 window.HTMLCanvasElement.prototype.getContext = function (name) { return 0; };
 ok(canvas.getContext('2d') === 0, "canvas.getContext('2d') === 0");
 
-if (!_deferred) SimpleTest.finish();
+SimpleTest.finish();
+
 });
 </script>