From 6325acca6c3b2af388f10157437dd5df05540719 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu"
 <bzbarsky%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 6 Dec 2007 02:51:13 +0000
Subject: [PATCH] Adding a whole bunch of canvas mochitests.  Bug 407049, tests
 contributed by Philip Taylor <philip.taylor@cl.cam.ac.uk>

git-svn-id: svn://10.0.0.236/trunk@240557 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/canvas/Makefile.in            |   4 +
 mozilla/content/canvas/test/Makefile.in       | 526 ++++++++++++++++++
 mozilla/content/canvas/test/image_broken.png  | Bin 0 -> 87 bytes
 .../canvas/test/image_ggrr-256x256.png        | Bin 0 -> 120 bytes
 .../content/canvas/test/image_green-16x16.png | Bin 0 -> 92 bytes
 .../content/canvas/test/image_green-1x1.png   | Bin 0 -> 82 bytes
 mozilla/content/canvas/test/image_green.png   | Bin 0 -> 87 bytes
 .../content/canvas/test/image_red-16x16.png   | Bin 0 -> 130 bytes
 mozilla/content/canvas/test/image_red.png     | Bin 0 -> 87 bytes
 .../canvas/test/image_redtransparent.png      | Bin 0 -> 109 bytes
 .../canvas/test/image_rgrg-256x256.png        | Bin 0 -> 131 bytes
 .../content/canvas/test/image_transparent.png | Bin 0 -> 100 bytes
 .../canvas/test/image_transparent50.png       | Bin 0 -> 155 bytes
 mozilla/content/canvas/test/image_yellow.png  | Bin 0 -> 95 bytes
 .../content/canvas/test/image_yellow75.png    | Bin 0 -> 150 bytes
 .../canvas/test/test_2d.canvas.readonly.html  |  25 +
 .../canvas/test/test_2d.canvas.reference.html |  22 +
 .../canvas/test/test_2d.clearRect.basic.html  |  37 ++
 .../canvas/test/test_2d.clearRect.clip.html   |  46 ++
 .../test/test_2d.clearRect.globalalpha.html   |  38 ++
 .../test_2d.clearRect.globalcomposite.html    |  38 ++
 .../canvas/test/test_2d.clearRect.path.html   |  39 ++
 .../canvas/test/test_2d.clearRect.shadow.html |  41 ++
 .../test/test_2d.clearRect.transform.html     |  39 ++
 .../canvas/test/test_2d.clearRect.zero.html   |  39 ++
 .../test_2d.composite.globalAlpha.canvas.html |  45 ++
 ...d.composite.globalAlpha.canvaspattern.html |  49 ++
 ...test_2d.composite.globalAlpha.default.html |  22 +
 .../test_2d.composite.globalAlpha.fill.html   |  39 ++
 .../test_2d.composite.globalAlpha.image.html  |  39 ++
 ...2d.composite.globalAlpha.imagepattern.html |  43 ++
 .../test_2d.composite.globalAlpha.range.html  |  31 ++
 .../test/test_2d.composite.image.copy.html    |  40 ++
 ...t_2d.composite.image.destination-atop.html |  40 ++
 ...est_2d.composite.image.destination-in.html |  40 ++
 ...st_2d.composite.image.destination-out.html |  40 ++
 ...t_2d.composite.image.destination-over.html |  40 ++
 .../test/test_2d.composite.image.lighter.html |  40 ++
 .../test_2d.composite.image.source-atop.html  |  40 ++
 .../test_2d.composite.image.source-in.html    |  40 ++
 .../test_2d.composite.image.source-out.html   |  40 ++
 .../test_2d.composite.image.source-over.html  |  40 ++
 .../test/test_2d.composite.image.xor.html     |  40 ++
 .../test_2d.composite.operation.clear.html    |  24 +
 .../test_2d.composite.operation.darker.html   |  24 +
 .../test_2d.composite.operation.default.html  |  22 +
 .../test/test_2d.composite.operation.get.html |  29 +
 .../test_2d.composite.operation.over.html     |  24 +
 .../test/test_2d.composite.solid.copy.html    |  40 ++
 ...t_2d.composite.solid.destination-atop.html |  40 ++
 ...est_2d.composite.solid.destination-in.html |  40 ++
 ...st_2d.composite.solid.destination-out.html |  40 ++
 ...t_2d.composite.solid.destination-over.html |  40 ++
 .../test/test_2d.composite.solid.lighter.html |  40 ++
 .../test_2d.composite.solid.source-atop.html  |  40 ++
 .../test_2d.composite.solid.source-in.html    |  40 ++
 .../test_2d.composite.solid.source-out.html   |  40 ++
 .../test_2d.composite.solid.source-over.html  |  40 ++
 .../test_2d.composite.transparent.copy.html   |  40 ++
 ...omposite.transparent.destination-atop.html |  40 ++
 ....composite.transparent.destination-in.html |  40 ++
 ...composite.transparent.destination-out.html |  40 ++
 ...omposite.transparent.destination-over.html |  40 ++
 ...test_2d.composite.transparent.lighter.html |  40 ++
 ..._2d.composite.transparent.source-atop.html |  40 ++
 ...st_2d.composite.transparent.source-in.html |  40 ++
 ...t_2d.composite.transparent.source-out.html |  40 ++
 ..._2d.composite.transparent.source-over.html |  40 ++
 .../test_2d.composite.transparent.xor.html    |  40 ++
 .../canvas/test/test_2d.drawImage.3arg.html   |  45 ++
 .../canvas/test/test_2d.drawImage.5arg.html   |  46 ++
 .../test/test_2d.drawImage.9arg.basic.html    |  41 ++
 .../test/test_2d.drawImage.9arg.destpos.html  |  46 ++
 .../test/test_2d.drawImage.9arg.destsize.html |  46 ++
 .../test_2d.drawImage.9arg.sourcepos.html     |  41 ++
 .../test_2d.drawImage.9arg.sourcesize.html    |  48 ++
 .../canvas/test/test_2d.drawImage.alpha.html  |  39 ++
 .../canvas/test/test_2d.drawImage.broken.html |  27 +
 .../canvas/test/test_2d.drawImage.clip.html   |  40 ++
 .../test/test_2d.drawImage.composite.html     |  39 ++
 .../test/test_2d.drawImage.floatsource.html   |  36 ++
 .../test/test_2d.drawImage.incomplete.html    |  26 +
 .../test/test_2d.drawImage.negativedest.html  |  30 +
 .../test_2d.drawImage.negativesource.html     |  27 +
 .../canvas/test/test_2d.drawImage.null.html   |  24 +
 .../test/test_2d.drawImage.outsidesource.html |  55 ++
 .../canvas/test/test_2d.drawImage.path.html   |  39 ++
 .../test/test_2d.drawImage.transform.html     |  39 ++
 .../test/test_2d.drawImage.wrongtype.html     |  33 ++
 .../test/test_2d.drawImage.zerosource.html    |  45 ++
 .../canvas/test/test_2d.fillRect.basic.html   |  36 ++
 .../canvas/test/test_2d.fillRect.clip.html    |  47 ++
 .../test/test_2d.fillRect.negative.html       |  27 +
 .../canvas/test/test_2d.fillRect.path.html    |  40 ++
 .../canvas/test/test_2d.fillRect.shadow.html  |  51 ++
 .../test/test_2d.fillRect.transform.html      |  38 ++
 .../canvas/test/test_2d.fillRect.zero.html    |  38 ++
 .../test/test_2d.fillStyle.default.html       |  22 +
 ...test_2d.fillStyle.get.semitransparent.html |  23 +
 .../test/test_2d.fillStyle.get.solid.html     |  23 +
 .../test_2d.fillStyle.get.transparent.html    |  23 +
 .../test/test_2d.fillStyle.invalidstring.html |  39 ++
 .../test/test_2d.fillStyle.invalidtype.html   |  39 ++
 .../test/test_2d.fillStyle.parse.flavor.html  |  25 +
 .../test/test_2d.fillStyle.parse.hex3.html    |  38 ++
 .../test/test_2d.fillStyle.parse.hex6.html    |  38 ++
 .../test/test_2d.fillStyle.parse.hsl-1.html   |  38 ++
 .../test/test_2d.fillStyle.parse.hsl-2.html   |  38 ++
 .../test/test_2d.fillStyle.parse.hsl-3.html   |  38 ++
 .../test/test_2d.fillStyle.parse.hsl-4.html   |  38 ++
 .../test/test_2d.fillStyle.parse.hsl-5.html   |  38 ++
 .../test/test_2d.fillStyle.parse.hsla-1.html  |  38 ++
 .../test/test_2d.fillStyle.parse.hsla-2.html  |  38 ++
 .../test/test_2d.fillStyle.parse.html4.html   |  38 ++
 .../test_2d.fillStyle.parse.invalid.hex3.html |  38 ++
 .../test_2d.fillStyle.parse.invalid.hex6.html |  38 ++
 ...test_2d.fillStyle.parse.invalid.hsl-1.html |  38 ++
 ...test_2d.fillStyle.parse.invalid.hsl-2.html |  38 ++
 ...test_2d.fillStyle.parse.invalid.hsl-3.html |  38 ++
 ...test_2d.fillStyle.parse.invalid.hsl-4.html |  38 ++
 ...test_2d.fillStyle.parse.invalid.rgb-1.html |  38 ++
 ...test_2d.fillStyle.parse.invalid.rgb-2.html |  38 ++
 ...test_2d.fillStyle.parse.invalid.rgb-3.html |  38 ++
 ...test_2d.fillStyle.parse.invalid.rgb-4.html |  38 ++
 ...est_2d.fillStyle.parse.invalid.rgba-1.html |  38 ++
 ...est_2d.fillStyle.parse.invalid.rgba-2.html |  38 ++
 ...est_2d.fillStyle.parse.invalid.rgba-3.html |  38 ++
 ...est_2d.fillStyle.parse.invalid.rgba-4.html |  38 ++
 ...est_2d.fillStyle.parse.invalid.rgba-5.html |  38 ++
 .../test_2d.fillStyle.parse.rgb-clamp-1.html  |  38 ++
 .../test_2d.fillStyle.parse.rgb-clamp-2.html  |  38 ++
 .../test/test_2d.fillStyle.parse.rgb-num.html |  38 ++
 .../test_2d.fillStyle.parse.rgb-percent.html  |  38 ++
 .../test_2d.fillStyle.parse.rgba-clamp-1.html |  38 ++
 .../test_2d.fillStyle.parse.rgba-clamp-2.html |  38 ++
 .../test_2d.fillStyle.parse.rgba-num-1.html   |  38 ++
 .../test_2d.fillStyle.parse.rgba-num-2.html   |  38 ++
 .../test_2d.fillStyle.parse.rgba-percent.html |  38 ++
 .../test_2d.fillStyle.parse.rgba-solid-1.html |  38 ++
 .../test_2d.fillStyle.parse.rgba-solid-2.html |  38 ++
 .../test/test_2d.fillStyle.parse.svg-1.html   |  38 ++
 .../test/test_2d.fillStyle.parse.svg-2.html   |  38 ++
 .../test/test_2d.fillStyle.parse.system.html  |  25 +
 ...test_2d.fillStyle.parse.transparent-1.html |  38 ++
 ...test_2d.fillStyle.parse.transparent-2.html |  38 ++
 .../test/test_2d.getcontext.exists.html       |  22 +
 .../test/test_2d.getcontext.shared.html       |  38 ++
 .../test/test_2d.getcontext.unique.html       |  22 +
 .../canvas/test/test_2d.gradient.empty.html   |  39 ++
 .../test_2d.gradient.interpolate.alpha.html   |  43 ++
 .../test_2d.gradient.interpolate.colour.html  |  41 ++
 ...t_2d.gradient.interpolate.colouralpha.html |  41 ++
 ...test_2d.gradient.interpolate.multiple.html |  43 ++
 .../test_2d.gradient.interpolate.outside.html |  45 ++
 .../test_2d.gradient.interpolate.overlap.html |  59 ++
 ...test_2d.gradient.interpolate.overlap2.html |  49 ++
 .../test_2d.gradient.interpolate.solid.html   |  39 ++
 ...test_2d.gradient.interpolate.vertical.html |  41 ++
 ...test_2d.gradient.interpolate.zerosize.html |  45 ++
 .../test/test_2d.gradient.object.compare.html |  26 +
 .../test_2d.gradient.object.crosscanvas.html  |  41 ++
 ...test_2d.gradient.object.invalidcolour.html |  28 +
 ...test_2d.gradient.object.invalidoffset.html |  37 ++
 .../test/test_2d.gradient.object.return.html  |  28 +
 .../test/test_2d.gradient.object.update.html  |  41 ++
 .../test_2d.gradient.radial.cone.bottom.html  |  51 ++
 ...test_2d.gradient.radial.cone.cylinder.html |  51 ++
 .../test_2d.gradient.radial.cone.front.html   |  51 ++
 .../test_2d.gradient.radial.cone.shape1.html  |  60 ++
 .../test_2d.gradient.radial.cone.top.html     |  51 ++
 .../test/test_2d.gradient.radial.inside1.html |  51 ++
 .../test/test_2d.gradient.radial.inside2.html |  51 ++
 .../test/test_2d.gradient.radial.inside3.html |  52 ++
 .../test/test_2d.gradient.radial.invalid.html |  45 ++
 .../test_2d.gradient.radial.negative.html     |  27 +
 .../test_2d.gradient.radial.outside1.html     |  51 ++
 .../test/test_2d.imageData.get.basic.html     |  22 +
 .../test/test_2d.imageData.get.nonfinite.html |  57 ++
 .../test_2d.imageData.get.nonpositive.html    |  39 ++
 .../test/test_2d.imageData.get.nonpremul.html |  29 +
 .../test_2d.imageData.get.order.alpha.html    |  26 +
 .../test_2d.imageData.get.order.cols.html     |  29 +
 .../test/test_2d.imageData.get.order.rgb.html |  28 +
 .../test_2d.imageData.get.order.rows.html     |  29 +
 .../test_2d.imageData.get.properties.html     |  26 +
 .../test/test_2d.imageData.get.smallest.html  |  25 +
 .../test/test_2d.imageData.get.sourcepos.html |  29 +
 .../test_2d.imageData.get.sourcesize.html     |  25 +
 .../test/test_2d.imageData.get.values.html    |  29 +
 .../test/test_2d.imageData.put.alpha.html     |  40 ++
 .../test/test_2d.imageData.put.basic.html     |  40 ++
 .../test/test_2d.imageData.put.modified.html  |  45 ++
 .../test/test_2d.imageData.put.path.html      |  41 ++
 .../test_2d.imageData.put.type.correct.html   |  44 ++
 .../test_2d.imageData.put.type.extra.html     |  44 ++
 ...est_2d.imageData.put.type.invalidsize.html |  55 ++
 ...t_2d.imageData.put.type.invalidvalues.html |  39 ++
 .../test_2d.imageData.put.type.missing.html   |  31 ++
 .../test_2d.imageData.put.type.onepixel.html  |  23 +
 .../test_2d.imageData.put.unaffected.html     |  45 ++
 .../test/test_2d.imageData.put.unchanged.html |  41 ++
 .../canvas/test/test_2d.line.cap.closed.html  |  53 ++
 .../canvas/test/test_2d.line.cap.open.html    |  53 ++
 .../test_2d.line.cap.zerobezier.round.html    |  49 ++
 .../test/test_2d.line.cap.zeroline.round.html |  52 ++
 .../test_2d.line.cap.zeroline.square.html     |  49 ++
 .../canvas/test/test_2d.line.cross.html       |  50 ++
 .../canvas/test/test_2d.line.defaults.html    |  25 +
 .../test/test_2d.line.invalid.lineWidth.html  |  49 ++
 .../test/test_2d.line.invalid.miterLimit.html |  49 ++
 .../canvas/test/test_2d.line.join.closed.html |  52 ++
 .../canvas/test/test_2d.line.join.open.html   |  52 ++
 .../test/test_2d.line.join.parallel.html      |  49 ++
 .../test_2d.line.join.zeroline.corner.html    |  53 ++
 .../test/test_2d.line.join.zeroline.join.html |  50 ++
 .../test/test_2d.line.lineCap.butt.html       |  68 +++
 .../test/test_2d.line.lineCap.round.html      |  84 +++
 .../test/test_2d.line.lineCap.square.html     |  68 +++
 .../test/test_2d.line.lineJoin.bevel.html     |  87 +++
 .../test/test_2d.line.lineJoin.miter.html     |  78 +++
 .../test/test_2d.line.lineJoin.round.html     |  85 +++
 .../test/test_2d.line.lineWidth.basic.html    |  70 +++
 .../test_2d.line.lineWidth.transformed.html   |  76 +++
 .../test/test_2d.line.miter.exceeded.html     |  51 ++
 .../test/test_2d.line.miter.lineedge.html     |  50 ++
 .../test/test_2d.line.miter.rightangle.html   |  53 ++
 .../test/test_2d.line.miter.within.html       |  51 ++
 .../canvas/test/test_2d.line.union.html       |  53 ++
 .../canvas/test/test_2d.path.arc.angle.1.html |  39 ++
 .../canvas/test/test_2d.path.arc.angle.2.html |  39 ++
 .../canvas/test/test_2d.path.arc.angle.3.html |  39 ++
 .../canvas/test/test_2d.path.arc.angle.4.html |  39 ++
 .../canvas/test/test_2d.path.arc.empty.html   |  39 ++
 .../canvas/test/test_2d.path.arc.end.html     |  41 ++
 .../test/test_2d.path.arc.negative.html       |  24 +
 .../test/test_2d.path.arc.nonempty.html       |  40 ++
 .../test_2d.path.arc.selfintersect.1.html     |  42 ++
 .../test_2d.path.arc.selfintersect.2.html     |  47 ++
 .../canvas/test/test_2d.path.arc.shape.1.html |  44 ++
 .../canvas/test/test_2d.path.arc.shape.2.html |  44 ++
 .../canvas/test/test_2d.path.arc.shape.3.html |  39 ++
 .../canvas/test/test_2d.path.arc.shape.4.html |  39 ++
 .../canvas/test/test_2d.path.arc.shape.5.html |  39 ++
 .../canvas/test/test_2d.path.arc.zero.1.html  |  39 ++
 .../canvas/test/test_2d.path.arc.zero.2.html  |  39 ++
 .../canvas/test/test_2d.path.arc.zero.3.html  |  39 ++
 .../canvas/test/test_2d.path.arc.zero.4.html  |  39 ++
 .../canvas/test/test_2d.path.arc.zero.5.html  |  39 ++
 .../canvas/test/test_2d.path.arc.zero.6.html  |  39 ++
 .../canvas/test/test_2d.path.arc.zero.html    |  24 +
 .../canvas/test/test_2d.path.beginPath.html   |  38 ++
 .../test_2d.path.bezierCurveTo.basic.html     |  40 ++
 ...st_2d.path.bezierCurveTo.emptysubpath.html |  43 ++
 .../test_2d.path.bezierCurveTo.scaled.html    |  45 ++
 .../test_2d.path.bezierCurveTo.shape.html     |  44 ++
 .../test/test_2d.path.clip.basic.1.html       |  44 ++
 .../test/test_2d.path.clip.basic.2.html       |  44 ++
 .../canvas/test/test_2d.path.clip.empty.html  |  43 ++
 .../test/test_2d.path.clip.intersect.html     |  47 ++
 .../test/test_2d.path.clip.unaffected.html    |  49 ++
 .../test/test_2d.path.clip.winding.1.html     |  52 ++
 .../test/test_2d.path.clip.winding.2.html     |  56 ++
 .../test/test_2d.path.closePath.empty.html    |  37 ++
 .../test/test_2d.path.closePath.newline.html  |  42 ++
 .../test_2d.path.closePath.nextpoint.html     |  41 ++
 .../test/test_2d.path.fill.closed.basic.html  |  44 ++
 .../test_2d.path.fill.closed.unaffected.html  |  47 ++
 .../test/test_2d.path.fill.winding.add.html   |  49 ++
 .../test_2d.path.fill.winding.subtract.1.html |  49 ++
 .../test_2d.path.fill.winding.subtract.2.html |  48 ++
 .../test_2d.path.fill.winding.subtract.3.html |  54 ++
 .../canvas/test/test_2d.path.initial.html     |  44 ++
 .../test_2d.path.isPointInPath.basic.1.html   |  23 +
 .../test_2d.path.isPointInPath.basic.2.html   |  23 +
 .../test_2d.path.isPointInPath.empty.html     |  22 +
 ...est_2d.path.isPointInPath.transform.1.html |  29 +
 ...est_2d.path.isPointInPath.transform.2.html |  29 +
 ...est_2d.path.isPointInPath.transform.3.html |  29 +
 .../test_2d.path.isPointInPath.unclosed.html  |  26 +
 .../test_2d.path.isPointInPath.winding.html   |  40 ++
 .../test/test_2d.path.lineTo.basic.html       |  40 ++
 .../test_2d.path.lineTo.emptysubpath.html     |  43 ++
 .../test/test_2d.path.lineTo.nextpoint.html   |  41 ++
 .../test/test_2d.path.moveTo.basic.html       |  41 ++
 .../test/test_2d.path.moveTo.multiple.html    |  41 ++
 .../test/test_2d.path.moveTo.newsubpath.html  |  41 ++
 .../test_2d.path.quadraticCurveTo.basic.html  |  40 ++
 ...2d.path.quadraticCurveTo.emptysubpath.html |  43 ++
 .../test_2d.path.quadraticCurveTo.scaled.html |  45 ++
 .../test_2d.path.quadraticCurveTo.shape.html  |  44 ++
 .../canvas/test/test_2d.path.rect.basic.html  |  37 ++
 .../canvas/test/test_2d.path.rect.closed.html |  39 ++
 .../canvas/test/test_2d.path.rect.end.1.html  |  39 ++
 .../canvas/test/test_2d.path.rect.end.2.html  |  44 ++
 .../test/test_2d.path.rect.negative.html      |  30 +
 .../test/test_2d.path.rect.newsubpath.html    |  41 ++
 .../test/test_2d.path.rect.selfintersect.html |  39 ++
 .../canvas/test/test_2d.path.rect.zero.1.html |  39 ++
 .../canvas/test/test_2d.path.rect.zero.2.html |  39 ++
 .../canvas/test/test_2d.path.rect.zero.3.html |  39 ++
 .../canvas/test/test_2d.path.rect.zero.4.html |  39 ++
 .../canvas/test/test_2d.path.rect.zero.5.html |  39 ++
 .../canvas/test/test_2d.path.rect.zero.6.html |  41 ++
 .../test/test_2d.path.stroke.unaffected.html  |  49 ++
 .../test/test_2d.path.stroke.union.html       |  45 ++
 .../test_2d.path.transformation.basic.html    |  45 ++
 ...est_2d.path.transformation.multiple.1.html |  46 ++
 ...est_2d.path.transformation.multiple.2.html |  47 ++
 ...est_2d.path.transformation.multiple.3.html |  48 ++
 .../test/test_2d.pattern.basic.canvas.html    |  56 ++
 .../test/test_2d.pattern.basic.image.html     |  45 ++
 .../test/test_2d.pattern.basic.nocontext.html |  47 ++
 .../test/test_2d.pattern.basic.type.html      |  25 +
 .../test/test_2d.pattern.crosscanvas.html     |  43 ++
 .../test/test_2d.pattern.image.broken.html    |  27 +
 .../test_2d.pattern.image.incomplete.html     |  26 +
 .../test/test_2d.pattern.image.null.html      |  24 +
 .../test/test_2d.pattern.image.string.html    |  24 +
 .../test/test_2d.pattern.image.undefined.html |  24 +
 .../test/test_2d.pattern.modify.canvas1.html  |  52 ++
 .../test/test_2d.pattern.modify.canvas2.html  |  56 ++
 .../test/test_2d.pattern.modify.image1.html   |  57 ++
 .../test/test_2d.pattern.modify.image2.html   |  61 ++
 .../test/test_2d.pattern.paint.coord3.html    |  50 ++
 .../test_2d.pattern.paint.norepeat.basic.html |  46 ++
 ...test_2d.pattern.paint.norepeat.coord1.html |  49 ++
 ...test_2d.pattern.paint.norepeat.coord2.html |  50 ++
 ...est_2d.pattern.paint.norepeat.outside.html |  52 ++
 .../test_2d.pattern.paint.repeat.basic.html   |  46 ++
 .../test_2d.pattern.paint.repeat.coord1.html  |  47 ++
 .../test_2d.pattern.paint.repeat.coord2.html  |  43 ++
 .../test_2d.pattern.paint.repeat.coord3.html  |  49 ++
 .../test_2d.pattern.paint.repeat.outside.html |  47 ++
 .../test_2d.pattern.paint.repeatx.basic.html  |  48 ++
 .../test_2d.pattern.paint.repeatx.coord1.html |  55 ++
 ...test_2d.pattern.paint.repeatx.outside.html |  52 ++
 .../test_2d.pattern.paint.repeaty.basic.html  |  48 ++
 .../test_2d.pattern.paint.repeaty.coord1.html |  55 ++
 ...test_2d.pattern.paint.repeaty.outside.html |  52 ++
 .../test/test_2d.pattern.repeat.case.html     |  24 +
 .../test/test_2d.pattern.repeat.empty.html    |  45 ++
 .../test/test_2d.pattern.repeat.missing.html  |  24 +
 .../test/test_2d.pattern.repeat.null.html     |  45 ++
 .../test_2d.pattern.repeat.nullsuffix.html    |  24 +
 .../test_2d.pattern.repeat.undefined.html     |  24 +
 .../test_2d.pattern.repeat.unrecognised.html  |  24 +
 .../test_2d.state.saverestore.bitmap.html     |  40 ++
 .../test/test_2d.state.saverestore.clip.html  |  42 ++
 .../test_2d.state.saverestore.fillStyle.html  |  36 ++
 ...test_2d.state.saverestore.globalAlpha.html |  36 ++
 ....saverestore.globalCompositeOperation.html |  36 ++
 .../test_2d.state.saverestore.lineCap.html    |  36 ++
 .../test_2d.state.saverestore.lineJoin.html   |  36 ++
 .../test_2d.state.saverestore.lineWidth.html  |  36 ++
 .../test_2d.state.saverestore.miterLimit.html |  36 ++
 .../test/test_2d.state.saverestore.path.html  |  41 ++
 .../test_2d.state.saverestore.shadowBlur.html |  36 ++
 ...test_2d.state.saverestore.shadowColor.html |  36 ++
 ...st_2d.state.saverestore.shadowOffsetX.html |  36 ++
 ...st_2d.state.saverestore.shadowOffsetY.html |  36 ++
 .../test/test_2d.state.saverestore.stack.html |  31 ++
 .../test_2d.state.saverestore.stackdepth.html |  32 ++
 ...test_2d.state.saverestore.strokeStyle.html |  36 ++
 ...t_2d.state.saverestore.transformation.html |  41 ++
 .../canvas/test/test_2d.strokeRect.basic.html |  37 ++
 .../canvas/test/test_2d.strokeRect.clip.html  |  48 ++
 .../test/test_2d.strokeRect.globalalpha.html  |  38 ++
 .../test_2d.strokeRect.globalcomposite.html   |  38 ++
 .../test/test_2d.strokeRect.negative.html     |  27 +
 .../canvas/test/test_2d.strokeRect.path.html  |  41 ++
 .../test/test_2d.strokeRect.shadow.html       |  53 ++
 .../test/test_2d.strokeRect.transform.html    |  39 ++
 .../test/test_2d.strokeRect.zero.1.html       |  37 ++
 .../test/test_2d.strokeRect.zero.2.html       |  42 ++
 .../test/test_2d.strokeRect.zero.3.html       |  37 ++
 .../test/test_2d.strokeRect.zero.4.html       |  38 ++
 .../test/test_2d.strokeRect.zero.5.html       |  38 ++
 .../test/test_2d.strokeStyle.default.html     |  22 +
 .../test/test_2d.transformation.order.html    |  41 ++
 ...st_2d.transformation.rotate.direction.html |  40 ++
 ...est_2d.transformation.rotate.infinity.html |  24 +
 .../test_2d.transformation.rotate.nan.html    |  24 +
 ..._2d.transformation.rotate.neginfinity.html |  24 +
 ...test_2d.transformation.rotate.radians.html |  40 ++
 .../test_2d.transformation.rotate.wrap.html   |  45 ++
 ...2d.transformation.rotate.wrapnegative.html |  42 ++
 .../test_2d.transformation.rotate.zero.html   |  40 ++
 .../test_2d.transformation.scale.basic.html   |  40 ++
 .../test_2d.transformation.scale.large.html   |  40 ++
 ...test_2d.transformation.scale.multiple.html |  41 ++
 ...test_2d.transformation.scale.negative.html |  49 ++
 .../test_2d.transformation.scale.zero.html    |  50 ++
 ....transformation.setTransform.multiple.html |  41 ++
 ...2d.transformation.setTransform.skewed.html |  62 +++
 ..._2d.transformation.transform.identity.html |  40 ++
 ..._2d.transformation.transform.multiply.html |  41 ++
 ...st_2d.transformation.transform.skewed.html |  62 +++
 ...est_2d.transformation.translate.basic.html |  40 ++
 .../canvas/test/test_2d.type.delete.html      |  23 +
 .../canvas/test/test_2d.type.exists.html      |  22 +
 .../canvas/test/test_2d.type.extend.html      |  41 ++
 .../canvas/test/test_2d.type.name.html        |  22 +
 .../canvas/test/test_2d.type.prototype.html   |  31 ++
 .../canvas/test/test_2d.type.replace.html     |  42 ++
 .../canvas/test/test_2d.voidreturn.html       |  54 ++
 .../canvas/test/test_fallback.basic.html      |  22 +
 .../canvas/test/test_fallback.multiple.html   |  22 +
 .../canvas/test/test_fallback.nested.html     |  22 +
 .../canvas/test/test_initial.colour.html      |  34 ++
 .../test/test_initial.reset.2dstate.html      |  83 +++
 .../canvas/test/test_initial.reset.clip.html  |  40 ++
 .../test/test_initial.reset.different.html    |  38 ++
 .../test/test_initial.reset.gradient.html     |  43 ++
 .../canvas/test/test_initial.reset.path.html  |  39 ++
 .../test/test_initial.reset.pattern.html      |  43 ++
 .../canvas/test/test_initial.reset.same.html  |  39 ++
 .../test/test_initial.reset.transform.html    |  39 ++
 .../test/test_size.attributes.default.html    |  25 +
 .../canvas/test/test_size.attributes.html     |  25 +
 .../test_size.attributes.parse.badsuffix.html |  22 +
 ...est_size.attributes.parse.floatsuffix.html |  22 +
 .../test_size.attributes.parse.negative.html  |  22 +
 .../test_size.attributes.parse.nonnumber.html |  22 +
 ...t_size.attributes.parse.percentsuffix.html |  22 +
 ...test_size.attributes.parse.whitespace.html |  22 +
 .../test/test_size.attributes.parse.zero.html |  22 +
 ...test_size.attributes.parse.zerosuffix.html |  22 +
 .../test/test_size.attributes.reflect.1.html  |  27 +
 .../test/test_size.attributes.reflect.2.html  |  27 +
 .../test/test_size.attributes.removed.html    |  23 +
 ...ize.attributes.setAttribute.badsuffix.html |  23 +
 ...e.attributes.setAttribute.floatsuffix.html |  24 +
 ...size.attributes.setAttribute.negative.html |  23 +
 ...ize.attributes.setAttribute.nonnumber.html |  23 +
 ...attributes.setAttribute.percentsuffix.html |  23 +
 ...ze.attributes.setAttribute.whitespace.html |  23 +
 ...est_size.attributes.setAttribute.zero.html |  23 +
 ...ze.attributes.setAttribute.zerosuffix.html |  24 +
 .../test/test_size.attributes.style.html      |  23 +
 .../test/test_size.attributes.type.get.html   |  25 +
 .../test/test_size.attributes.type.set.html   |  25 +
 .../test/test_toDataURL.complexcolours.html   |  65 +++
 .../canvas/test/test_toDataURL.default.html   |  23 +
 .../canvas/test/test_toDataURL.nocontext.html |  24 +
 .../canvas/test/test_toDataURL.png.html       |  23 +
 .../test/test_toDataURL.primarycolours.html   |  64 +++
 .../content/canvas/test/test_type.delete.html |  23 +
 .../content/canvas/test/test_type.exists.html |  22 +
 .../content/canvas/test/test_type.extend.html |  23 +
 .../content/canvas/test/test_type.name.html   |  22 +
 .../canvas/test/test_type.prototype.html      |  31 ++
 .../canvas/test/test_type.replace.html        |  23 +
 452 files changed, 17609 insertions(+)
 create mode 100644 mozilla/content/canvas/test/Makefile.in
 create mode 100644 mozilla/content/canvas/test/image_broken.png
 create mode 100644 mozilla/content/canvas/test/image_ggrr-256x256.png
 create mode 100644 mozilla/content/canvas/test/image_green-16x16.png
 create mode 100644 mozilla/content/canvas/test/image_green-1x1.png
 create mode 100644 mozilla/content/canvas/test/image_green.png
 create mode 100644 mozilla/content/canvas/test/image_red-16x16.png
 create mode 100644 mozilla/content/canvas/test/image_red.png
 create mode 100644 mozilla/content/canvas/test/image_redtransparent.png
 create mode 100644 mozilla/content/canvas/test/image_rgrg-256x256.png
 create mode 100644 mozilla/content/canvas/test/image_transparent.png
 create mode 100644 mozilla/content/canvas/test/image_transparent50.png
 create mode 100644 mozilla/content/canvas/test/image_yellow.png
 create mode 100644 mozilla/content/canvas/test/image_yellow75.png
 create mode 100644 mozilla/content/canvas/test/test_2d.canvas.readonly.html
 create mode 100644 mozilla/content/canvas/test/test_2d.canvas.reference.html
 create mode 100644 mozilla/content/canvas/test/test_2d.clearRect.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.clearRect.clip.html
 create mode 100644 mozilla/content/canvas/test/test_2d.clearRect.globalalpha.html
 create mode 100644 mozilla/content/canvas/test/test_2d.clearRect.globalcomposite.html
 create mode 100644 mozilla/content/canvas/test/test_2d.clearRect.path.html
 create mode 100644 mozilla/content/canvas/test/test_2d.clearRect.shadow.html
 create mode 100644 mozilla/content/canvas/test/test_2d.clearRect.transform.html
 create mode 100644 mozilla/content/canvas/test/test_2d.clearRect.zero.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.globalAlpha.canvas.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.globalAlpha.canvaspattern.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.globalAlpha.default.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.globalAlpha.fill.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.globalAlpha.image.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.globalAlpha.imagepattern.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.globalAlpha.range.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.image.copy.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.image.destination-atop.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.image.destination-in.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.image.destination-out.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.image.destination-over.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.image.lighter.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.image.source-atop.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.image.source-in.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.image.source-out.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.image.source-over.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.image.xor.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.operation.clear.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.operation.darker.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.operation.default.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.operation.get.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.operation.over.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.solid.copy.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.solid.destination-atop.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.solid.destination-in.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.solid.destination-out.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.solid.destination-over.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.solid.lighter.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.solid.source-atop.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.solid.source-in.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.solid.source-out.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.solid.source-over.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.transparent.copy.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.transparent.destination-atop.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.transparent.destination-in.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.transparent.destination-out.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.transparent.destination-over.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.transparent.lighter.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.transparent.source-atop.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.transparent.source-in.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.transparent.source-out.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.transparent.source-over.html
 create mode 100644 mozilla/content/canvas/test/test_2d.composite.transparent.xor.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.3arg.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.5arg.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.9arg.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.9arg.destpos.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.9arg.destsize.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.9arg.sourcepos.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.9arg.sourcesize.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.alpha.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.broken.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.clip.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.composite.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.floatsource.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.incomplete.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.negativedest.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.negativesource.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.null.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.outsidesource.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.path.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.transform.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.wrongtype.html
 create mode 100644 mozilla/content/canvas/test/test_2d.drawImage.zerosource.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillRect.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillRect.clip.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillRect.negative.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillRect.path.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillRect.shadow.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillRect.transform.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillRect.zero.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.default.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.get.semitransparent.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.get.solid.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.get.transparent.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.invalidstring.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.invalidtype.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.flavor.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.hex3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.hex6.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-4.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-5.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.hsla-1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.hsla-2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.html4.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hex3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hex6.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-4.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-4.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-4.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-5.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-num.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-percent.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-num-1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-num-2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-percent.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.svg-1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.svg-2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.system.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.transparent-1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.fillStyle.parse.transparent-2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.getcontext.exists.html
 create mode 100644 mozilla/content/canvas/test/test_2d.getcontext.shared.html
 create mode 100644 mozilla/content/canvas/test/test_2d.getcontext.unique.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.empty.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.interpolate.alpha.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.interpolate.colour.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.interpolate.colouralpha.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.interpolate.multiple.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.interpolate.outside.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.interpolate.overlap.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.interpolate.overlap2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.interpolate.solid.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.interpolate.vertical.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.interpolate.zerosize.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.object.compare.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.object.crosscanvas.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.object.invalidcolour.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.object.invalidoffset.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.object.return.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.object.update.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.radial.cone.bottom.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.radial.cone.cylinder.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.radial.cone.front.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.radial.cone.shape1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.radial.cone.top.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.radial.inside1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.radial.inside2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.radial.inside3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.radial.invalid.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.radial.negative.html
 create mode 100644 mozilla/content/canvas/test/test_2d.gradient.radial.outside1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.get.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.get.nonfinite.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.get.nonpositive.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.get.nonpremul.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.get.order.alpha.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.get.order.cols.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.get.order.rgb.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.get.order.rows.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.get.properties.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.get.smallest.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.get.sourcepos.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.get.sourcesize.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.get.values.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.put.alpha.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.put.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.put.modified.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.put.path.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.put.type.correct.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.put.type.extra.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.put.type.invalidsize.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.put.type.invalidvalues.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.put.type.missing.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.put.type.onepixel.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.put.unaffected.html
 create mode 100644 mozilla/content/canvas/test/test_2d.imageData.put.unchanged.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.cap.closed.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.cap.open.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.cap.zerobezier.round.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.cap.zeroline.round.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.cap.zeroline.square.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.cross.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.defaults.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.invalid.lineWidth.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.invalid.miterLimit.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.join.closed.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.join.open.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.join.parallel.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.join.zeroline.corner.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.join.zeroline.join.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.lineCap.butt.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.lineCap.round.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.lineCap.square.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.lineJoin.bevel.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.lineJoin.miter.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.lineJoin.round.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.lineWidth.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.lineWidth.transformed.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.miter.exceeded.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.miter.lineedge.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.miter.rightangle.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.miter.within.html
 create mode 100644 mozilla/content/canvas/test/test_2d.line.union.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.angle.1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.angle.2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.angle.3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.angle.4.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.empty.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.end.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.negative.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.nonempty.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.selfintersect.1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.selfintersect.2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.shape.1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.shape.2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.shape.3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.shape.4.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.shape.5.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.zero.1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.zero.2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.zero.3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.zero.4.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.zero.5.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.zero.6.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.arc.zero.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.beginPath.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.bezierCurveTo.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.bezierCurveTo.emptysubpath.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.bezierCurveTo.scaled.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.bezierCurveTo.shape.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.clip.basic.1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.clip.basic.2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.clip.empty.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.clip.intersect.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.clip.unaffected.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.clip.winding.1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.clip.winding.2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.closePath.empty.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.closePath.newline.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.closePath.nextpoint.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.fill.closed.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.fill.closed.unaffected.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.fill.winding.add.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.fill.winding.subtract.1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.fill.winding.subtract.2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.fill.winding.subtract.3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.initial.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.isPointInPath.basic.1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.isPointInPath.basic.2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.isPointInPath.empty.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.isPointInPath.transform.1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.isPointInPath.transform.2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.isPointInPath.transform.3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.isPointInPath.unclosed.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.isPointInPath.winding.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.lineTo.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.lineTo.emptysubpath.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.lineTo.nextpoint.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.moveTo.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.moveTo.multiple.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.moveTo.newsubpath.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.emptysubpath.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.scaled.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.shape.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.rect.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.rect.closed.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.rect.end.1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.rect.end.2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.rect.negative.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.rect.newsubpath.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.rect.selfintersect.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.rect.zero.1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.rect.zero.2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.rect.zero.3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.rect.zero.4.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.rect.zero.5.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.rect.zero.6.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.stroke.unaffected.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.stroke.union.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.transformation.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.transformation.multiple.1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.transformation.multiple.2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.path.transformation.multiple.3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.basic.canvas.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.basic.image.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.basic.nocontext.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.basic.type.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.crosscanvas.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.image.broken.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.image.incomplete.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.image.null.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.image.string.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.image.undefined.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.modify.canvas1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.modify.canvas2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.modify.image1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.modify.image2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.coord3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.coord1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.coord2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.outside.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.repeat.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.repeat.coord1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.repeat.coord2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.repeat.coord3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.repeat.outside.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.repeatx.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.repeatx.coord1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.repeatx.outside.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.repeaty.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.repeaty.coord1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.paint.repeaty.outside.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.repeat.case.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.repeat.empty.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.repeat.missing.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.repeat.null.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.repeat.nullsuffix.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.repeat.undefined.html
 create mode 100644 mozilla/content/canvas/test/test_2d.pattern.repeat.unrecognised.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.bitmap.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.clip.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.fillStyle.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.globalAlpha.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.globalCompositeOperation.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.lineCap.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.lineJoin.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.lineWidth.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.miterLimit.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.path.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.shadowBlur.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.shadowColor.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.shadowOffsetX.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.shadowOffsetY.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.stack.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.stackdepth.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.strokeStyle.html
 create mode 100644 mozilla/content/canvas/test/test_2d.state.saverestore.transformation.html
 create mode 100644 mozilla/content/canvas/test/test_2d.strokeRect.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.strokeRect.clip.html
 create mode 100644 mozilla/content/canvas/test/test_2d.strokeRect.globalalpha.html
 create mode 100644 mozilla/content/canvas/test/test_2d.strokeRect.globalcomposite.html
 create mode 100644 mozilla/content/canvas/test/test_2d.strokeRect.negative.html
 create mode 100644 mozilla/content/canvas/test/test_2d.strokeRect.path.html
 create mode 100644 mozilla/content/canvas/test/test_2d.strokeRect.shadow.html
 create mode 100644 mozilla/content/canvas/test/test_2d.strokeRect.transform.html
 create mode 100644 mozilla/content/canvas/test/test_2d.strokeRect.zero.1.html
 create mode 100644 mozilla/content/canvas/test/test_2d.strokeRect.zero.2.html
 create mode 100644 mozilla/content/canvas/test/test_2d.strokeRect.zero.3.html
 create mode 100644 mozilla/content/canvas/test/test_2d.strokeRect.zero.4.html
 create mode 100644 mozilla/content/canvas/test/test_2d.strokeRect.zero.5.html
 create mode 100644 mozilla/content/canvas/test/test_2d.strokeStyle.default.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.order.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.rotate.direction.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.rotate.infinity.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.rotate.nan.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.rotate.neginfinity.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.rotate.radians.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.rotate.wrap.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.rotate.wrapnegative.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.rotate.zero.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.scale.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.scale.large.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.scale.multiple.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.scale.negative.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.scale.zero.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.setTransform.multiple.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.setTransform.skewed.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.transform.identity.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.transform.multiply.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.transform.skewed.html
 create mode 100644 mozilla/content/canvas/test/test_2d.transformation.translate.basic.html
 create mode 100644 mozilla/content/canvas/test/test_2d.type.delete.html
 create mode 100644 mozilla/content/canvas/test/test_2d.type.exists.html
 create mode 100644 mozilla/content/canvas/test/test_2d.type.extend.html
 create mode 100644 mozilla/content/canvas/test/test_2d.type.name.html
 create mode 100644 mozilla/content/canvas/test/test_2d.type.prototype.html
 create mode 100644 mozilla/content/canvas/test/test_2d.type.replace.html
 create mode 100644 mozilla/content/canvas/test/test_2d.voidreturn.html
 create mode 100644 mozilla/content/canvas/test/test_fallback.basic.html
 create mode 100644 mozilla/content/canvas/test/test_fallback.multiple.html
 create mode 100644 mozilla/content/canvas/test/test_fallback.nested.html
 create mode 100644 mozilla/content/canvas/test/test_initial.colour.html
 create mode 100644 mozilla/content/canvas/test/test_initial.reset.2dstate.html
 create mode 100644 mozilla/content/canvas/test/test_initial.reset.clip.html
 create mode 100644 mozilla/content/canvas/test/test_initial.reset.different.html
 create mode 100644 mozilla/content/canvas/test/test_initial.reset.gradient.html
 create mode 100644 mozilla/content/canvas/test/test_initial.reset.path.html
 create mode 100644 mozilla/content/canvas/test/test_initial.reset.pattern.html
 create mode 100644 mozilla/content/canvas/test/test_initial.reset.same.html
 create mode 100644 mozilla/content/canvas/test/test_initial.reset.transform.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.default.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.parse.badsuffix.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.parse.floatsuffix.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.parse.negative.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.parse.nonnumber.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.parse.percentsuffix.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.parse.whitespace.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.parse.zero.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.parse.zerosuffix.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.reflect.1.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.reflect.2.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.removed.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.setAttribute.badsuffix.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.setAttribute.floatsuffix.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.setAttribute.negative.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.setAttribute.nonnumber.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.setAttribute.percentsuffix.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.setAttribute.whitespace.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.setAttribute.zero.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.setAttribute.zerosuffix.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.style.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.type.get.html
 create mode 100644 mozilla/content/canvas/test/test_size.attributes.type.set.html
 create mode 100644 mozilla/content/canvas/test/test_toDataURL.complexcolours.html
 create mode 100644 mozilla/content/canvas/test/test_toDataURL.default.html
 create mode 100644 mozilla/content/canvas/test/test_toDataURL.nocontext.html
 create mode 100644 mozilla/content/canvas/test/test_toDataURL.png.html
 create mode 100644 mozilla/content/canvas/test/test_toDataURL.primarycolours.html
 create mode 100644 mozilla/content/canvas/test/test_type.delete.html
 create mode 100644 mozilla/content/canvas/test/test_type.exists.html
 create mode 100644 mozilla/content/canvas/test/test_type.extend.html
 create mode 100644 mozilla/content/canvas/test/test_type.name.html
 create mode 100644 mozilla/content/canvas/test/test_type.prototype.html
 create mode 100644 mozilla/content/canvas/test/test_type.replace.html

diff --git a/mozilla/content/canvas/Makefile.in b/mozilla/content/canvas/Makefile.in
index 507d59551f7..f607d85e10e 100644
--- a/mozilla/content/canvas/Makefile.in
+++ b/mozilla/content/canvas/Makefile.in
@@ -44,5 +44,9 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= public src
 
+ifdef MOZ_MOCHITEST
+DIRS		+= test
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/content/canvas/test/Makefile.in b/mozilla/content/canvas/test/Makefile.in
new file mode 100644
index 00000000000..987ab1c29b4
--- /dev/null
+++ b/mozilla/content/canvas/test/Makefile.in
@@ -0,0 +1,526 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2007
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Philip Taylor <philip.taylor@cl.cam.ac.uk>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+relativesrcdir  = content/canvas/test
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+
+_TEST_FILES = \
+	test_fallback.basic.html \
+	test_fallback.multiple.html \
+	test_fallback.nested.html \
+	test_type.name.html \
+	test_type.exists.html \
+	test_type.delete.html \
+	test_type.prototype.html \
+	test_type.replace.html \
+	test_type.extend.html \
+	test_size.attributes.html \
+	test_size.attributes.type.get.html \
+	test_size.attributes.type.set.html \
+	test_size.attributes.default.html \
+	test_size.attributes.reflect.1.html \
+	test_size.attributes.reflect.2.html \
+	test_size.attributes.removed.html \
+	test_size.attributes.parse.whitespace.html \
+	test_size.attributes.parse.nonnumber.html \
+	test_size.attributes.parse.zero.html \
+	test_size.attributes.parse.negative.html \
+	test_size.attributes.parse.zerosuffix.html \
+	test_size.attributes.parse.floatsuffix.html \
+	test_size.attributes.parse.badsuffix.html \
+	test_size.attributes.parse.percentsuffix.html \
+	test_size.attributes.setAttribute.whitespace.html \
+	test_size.attributes.setAttribute.nonnumber.html \
+	test_size.attributes.setAttribute.zero.html \
+	test_size.attributes.setAttribute.negative.html \
+	test_size.attributes.setAttribute.zerosuffix.html \
+	test_size.attributes.setAttribute.floatsuffix.html \
+	test_size.attributes.setAttribute.badsuffix.html \
+	test_size.attributes.setAttribute.percentsuffix.html \
+	test_size.attributes.style.html \
+	test_initial.colour.html \
+	test_initial.reset.different.html \
+	test_initial.reset.same.html \
+	test_initial.reset.path.html \
+	test_initial.reset.clip.html \
+	test_initial.reset.transform.html \
+	test_initial.reset.gradient.html \
+	test_initial.reset.pattern.html \
+	test_toDataURL.default.html \
+	test_toDataURL.png.html \
+	test_toDataURL.nocontext.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 \
+	test_2d.type.replace.html \
+	test_2d.type.extend.html \
+	test_2d.getcontext.unique.html \
+	test_2d.getcontext.shared.html \
+	test_2d.voidreturn.html \
+	test_2d.canvas.reference.html \
+	test_2d.canvas.readonly.html \
+	test_2d.state.saverestore.strokeStyle.html \
+	test_2d.state.saverestore.fillStyle.html \
+	test_2d.state.saverestore.globalAlpha.html \
+	test_2d.state.saverestore.lineWidth.html \
+	test_2d.state.saverestore.lineCap.html \
+	test_2d.state.saverestore.lineJoin.html \
+	test_2d.state.saverestore.miterLimit.html \
+	test_2d.state.saverestore.shadowOffsetX.html \
+	test_2d.state.saverestore.shadowOffsetY.html \
+	test_2d.state.saverestore.shadowBlur.html \
+	test_2d.state.saverestore.shadowColor.html \
+	test_2d.state.saverestore.globalCompositeOperation.html \
+	test_initial.reset.2dstate.html \
+	test_2d.state.saverestore.transformation.html \
+	test_2d.state.saverestore.clip.html \
+	test_2d.state.saverestore.path.html \
+	test_2d.state.saverestore.bitmap.html \
+	test_2d.state.saverestore.stack.html \
+	test_2d.state.saverestore.stackdepth.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.multiple.html \
+	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.translate.basic.html \
+	test_2d.transformation.transform.identity.html \
+	test_2d.transformation.transform.skewed.html \
+	test_2d.transformation.transform.multiply.html \
+	test_2d.transformation.setTransform.skewed.html \
+	test_2d.transformation.setTransform.multiple.html \
+	test_2d.composite.globalAlpha.range.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 \
+	test_2d.composite.solid.source-over.html \
+	test_2d.composite.solid.destination-over.html \
+	test_2d.composite.solid.source-in.html \
+	test_2d.composite.solid.destination-in.html \
+	test_2d.composite.solid.source-out.html \
+	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.copy.html \
+	test_2d.composite.solid.lighter.html \
+	test_2d.composite.transparent.source-over.html \
+	test_2d.composite.transparent.destination-over.html \
+	test_2d.composite.transparent.source-in.html \
+	test_2d.composite.transparent.destination-in.html \
+	test_2d.composite.transparent.source-out.html \
+	test_2d.composite.transparent.destination-out.html \
+	test_2d.composite.transparent.source-atop.html \
+	test_2d.composite.transparent.destination-atop.html \
+	test_2d.composite.transparent.xor.html \
+	test_2d.composite.transparent.copy.html \
+	test_2d.composite.transparent.lighter.html \
+	test_2d.composite.image.source-over.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.operation.get.html \
+	test_2d.composite.operation.darker.html \
+	test_2d.composite.operation.over.html \
+	test_2d.composite.operation.clear.html \
+	test_2d.composite.operation.default.html \
+	test_2d.fillStyle.parse.html4.html \
+	test_2d.fillStyle.parse.hex3.html \
+	test_2d.fillStyle.parse.hex6.html \
+	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-percent.html \
+	test_2d.fillStyle.parse.rgba-solid-1.html \
+	test_2d.fillStyle.parse.rgba-solid-2.html \
+	test_2d.fillStyle.parse.rgba-num-1.html \
+	test_2d.fillStyle.parse.rgba-num-2.html \
+	test_2d.fillStyle.parse.rgba-percent.html \
+	test_2d.fillStyle.parse.rgba-clamp-1.html \
+	test_2d.fillStyle.parse.rgba-clamp-2.html \
+	test_2d.fillStyle.parse.transparent-1.html \
+	test_2d.fillStyle.parse.transparent-2.html \
+	test_2d.fillStyle.parse.hsl-1.html \
+	test_2d.fillStyle.parse.hsl-2.html \
+	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.hsla-1.html \
+	test_2d.fillStyle.parse.hsla-2.html \
+	test_2d.fillStyle.parse.svg-1.html \
+	test_2d.fillStyle.parse.svg-2.html \
+	test_2d.fillStyle.parse.invalid.hex3.html \
+	test_2d.fillStyle.parse.invalid.hex6.html \
+	test_2d.fillStyle.parse.invalid.rgb-1.html \
+	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.rgba-1.html \
+	test_2d.fillStyle.parse.invalid.rgba-2.html \
+	test_2d.fillStyle.parse.invalid.rgba-3.html \
+	test_2d.fillStyle.parse.invalid.rgba-4.html \
+	test_2d.fillStyle.parse.invalid.rgba-5.html \
+	test_2d.fillStyle.parse.invalid.hsl-1.html \
+	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.system.html \
+	test_2d.fillStyle.parse.flavor.html \
+	test_2d.fillStyle.invalidstring.html \
+	test_2d.fillStyle.invalidtype.html \
+	test_2d.fillStyle.get.solid.html \
+	test_2d.fillStyle.get.semitransparent.html \
+	test_2d.fillStyle.get.transparent.html \
+	test_2d.fillStyle.default.html \
+	test_2d.strokeStyle.default.html \
+	test_2d.gradient.object.return.html \
+	test_2d.gradient.interpolate.solid.html \
+	test_2d.gradient.interpolate.colour.html \
+	test_2d.gradient.interpolate.alpha.html \
+	test_2d.gradient.interpolate.colouralpha.html \
+	test_2d.gradient.interpolate.outside.html \
+	test_2d.gradient.interpolate.zerosize.html \
+	test_2d.gradient.interpolate.vertical.html \
+	test_2d.gradient.interpolate.multiple.html \
+	test_2d.gradient.interpolate.overlap.html \
+	test_2d.gradient.interpolate.overlap2.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.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.inside3.html \
+	test_2d.gradient.radial.outside1.html \
+	test_2d.gradient.radial.cone.front.html \
+	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.pattern.basic.type.html \
+	test_2d.pattern.basic.image.html \
+	test_2d.pattern.basic.canvas.html \
+	test_2d.pattern.basic.nocontext.html \
+	test_2d.pattern.image.undefined.html \
+	test_2d.pattern.image.null.html \
+	test_2d.pattern.image.string.html \
+	test_2d.pattern.image.incomplete.html \
+	test_2d.pattern.image.broken.html \
+	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 \
+	test_2d.pattern.modify.image1.html \
+	test_2d.pattern.modify.image2.html \
+	test_2d.pattern.modify.canvas1.html \
+	test_2d.pattern.modify.canvas2.html \
+	test_2d.pattern.crosscanvas.html \
+	test_2d.pattern.paint.norepeat.basic.html \
+	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.repeat.basic.html \
+	test_2d.pattern.paint.repeat.outside.html \
+	test_2d.pattern.paint.repeat.coord1.html \
+	test_2d.pattern.paint.repeat.coord2.html \
+	test_2d.pattern.paint.repeat.coord3.html \
+	test_2d.pattern.paint.repeatx.basic.html \
+	test_2d.pattern.paint.repeatx.outside.html \
+	test_2d.pattern.paint.repeatx.coord1.html \
+	test_2d.pattern.paint.repeaty.basic.html \
+	test_2d.pattern.paint.repeaty.outside.html \
+	test_2d.pattern.paint.repeaty.coord1.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.join.open.html \
+	test_2d.line.join.closed.html \
+	test_2d.line.join.zeroline.corner.html \
+	test_2d.line.join.zeroline.join.html \
+	test_2d.line.cap.open.html \
+	test_2d.line.cap.closed.html \
+	test_2d.line.cap.zeroline.round.html \
+	test_2d.line.cap.zeroline.square.html \
+	test_2d.line.miter.exceeded.html \
+	test_2d.line.miter.within.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.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.fillRect.basic.html \
+	test_2d.fillRect.path.html \
+	test_2d.fillRect.zero.html \
+	test_2d.fillRect.transform.html \
+	test_2d.fillRect.clip.html \
+	test_2d.fillRect.shadow.html \
+	test_2d.strokeRect.negative.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.transform.html \
+	test_2d.strokeRect.globalalpha.html \
+	test_2d.strokeRect.globalcomposite.html \
+	test_2d.strokeRect.clip.html \
+	test_2d.strokeRect.shadow.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.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.quadraticCurveTo.emptysubpath.html \
+	test_2d.path.quadraticCurveTo.basic.html \
+	test_2d.path.quadraticCurveTo.shape.html \
+	test_2d.path.quadraticCurveTo.scaled.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.arc.empty.html \
+	test_2d.path.arc.nonempty.html \
+	test_2d.path.arc.end.html \
+	test_2d.path.arc.angle.1.html \
+	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.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.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.rect.basic.html \
+	test_2d.path.rect.newsubpath.html \
+	test_2d.path.rect.closed.html \
+	test_2d.path.rect.end.1.html \
+	test_2d.path.rect.end.2.html \
+	test_2d.path.rect.zero.1.html \
+	test_2d.path.rect.zero.2.html \
+	test_2d.path.rect.zero.3.html \
+	test_2d.path.rect.zero.4.html \
+	test_2d.path.rect.zero.5.html \
+	test_2d.path.rect.negative.html \
+	test_2d.path.fill.winding.add.html \
+	test_2d.path.fill.winding.subtract.1.html \
+	test_2d.path.fill.winding.subtract.2.html \
+	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.union.html \
+	test_2d.path.stroke.unaffected.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.clip.empty.html \
+	test_2d.path.clip.basic.1.html \
+	test_2d.path.clip.basic.2.html \
+	test_2d.path.clip.intersect.html \
+	test_2d.path.clip.winding.1.html \
+	test_2d.path.clip.winding.2.html \
+	test_2d.path.clip.unaffected.html \
+	test_2d.path.isPointInPath.basic.1.html \
+	test_2d.path.isPointInPath.basic.2.html \
+	test_2d.path.isPointInPath.empty.html \
+	test_2d.path.isPointInPath.unclosed.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.drawImage.3arg.html \
+	test_2d.drawImage.5arg.html \
+	test_2d.drawImage.9arg.basic.html \
+	test_2d.drawImage.9arg.sourcepos.html \
+	test_2d.drawImage.9arg.sourcesize.html \
+	test_2d.drawImage.9arg.destpos.html \
+	test_2d.drawImage.9arg.destsize.html \
+	test_2d.drawImage.null.html \
+	test_2d.drawImage.wrongtype.html \
+	test_2d.drawImage.floatsource.html \
+	test_2d.drawImage.zerosource.html \
+	test_2d.drawImage.negativesource.html \
+	test_2d.drawImage.negativedest.html \
+	test_2d.drawImage.outsidesource.html \
+	test_2d.drawImage.incomplete.html \
+	test_2d.drawImage.broken.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.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.nonpremul.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.put.basic.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.unchanged.html \
+	test_2d.imageData.put.unaffected.html \
+	test_2d.imageData.put.path.html \
+	image_transparent50.png \
+	image_redtransparent.png \
+	image_yellow.png \
+	image_green-16x16.png \
+	image_red-16x16.png \
+	image_green-1x1.png \
+	image_ggrr-256x256.png \
+	image_yellow75.png \
+	image_broken.png \
+	image_rgrg-256x256.png \
+	image_red.png \
+	image_transparent.png \
+	image_green.png \
+	$(NULL)
+
+# This one test crashes Mac for now
+ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+_TEST_FILES += \
+	test_2d.gradient.empty.html \
+	$(NULL)
+endif
+
+# Tests that fail on Mac (possibly because spec is underdefined?)
+ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+_TEST_FILES += \
+	test_2d.line.cap.zerobezier.round.html \
+	test_2d.line.join.parallel.html \
+	test_2d.strokeRect.zero.5.html \
+	$(NULL)
+endif
+
+# Tests that fail on non-Mac (bug 401791)
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+_TEST_FILES += \
+	test_2d.line.miter.rightangle.html \
+	test_2d.line.miter.lineedge.html \
+	$(NULL)
+endif
+
+# Tests that fail on non-Mac (still need bugs)
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+_TEST_FILES += \
+	test_2d.path.rect.selfintersect.html \
+	test_2d.path.rect.zero.6.html \
+	$(NULL)
+endif
+
+libs:: $(_TEST_FILES)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
diff --git a/mozilla/content/canvas/test/image_broken.png b/mozilla/content/canvas/test/image_broken.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2581017b43d44664e7137a78c0803554b50f3b1
GIT binary patch
literal 87
zcmeAS@N?(olHy`uVBq!ia0vp^DL`z*$P6SW{C@KnNHGWagt-1^V32&oX%6J_d%8G=
RL|_3xIZszVmvv4FO#n416=47X

literal 0
HcmV?d00001

diff --git a/mozilla/content/canvas/test/image_ggrr-256x256.png b/mozilla/content/canvas/test/image_ggrr-256x256.png
new file mode 100644
index 0000000000000000000000000000000000000000..0342e4a38425886d5fa9159fcfaa9a06093937e3
GIT binary patch
literal 120
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K585o&?RN5XZRUpL{;1lA?@E-^nF3$E^2Ncou
zba4#HxcBzdMqUO64(0{_{%@Ig;oy#gK1@K#4>??p0xU4pk{oe$?T1I)2OWxmatxlX
KelF{r5}E+gJ0chW

literal 0
HcmV?d00001

diff --git a/mozilla/content/canvas/test/image_green-16x16.png b/mozilla/content/canvas/test/image_green-16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..e19a3ffddd2567de2be00a9bcede541935d79bd0
GIT binary patch
literal 92
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;bAV5XE5m;VlehybfLswz7srr_
lxTyykfgFa01%FqjueiWqz`&@!Uu6kM$kWx&Wt~$(696W66?^~y

literal 0
HcmV?d00001

diff --git a/mozilla/content/canvas/test/image_green-1x1.png b/mozilla/content/canvas/test/image_green-1x1.png
new file mode 100644
index 0000000000000000000000000000000000000000..862d1dd10cc9f261e0b4df57902258a85b2e6f4b
GIT binary patch
literal 82
zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)ga%mF?jt_=SfOyUl#0CKrJT^vI=
bWRnwsY$gWA^CwK70$B{6u6{1-oD!M<RL&6Z

literal 0
HcmV?d00001

diff --git a/mozilla/content/canvas/test/image_green.png b/mozilla/content/canvas/test/image_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..28a1faab37797ef39454aa1deac1b470712f7be4
GIT binary patch
literal 87
zcmeAS@N?(olHy`uVBq!ia0vp^DL`z*$P6SW{C@KnNHGWagt#*NXE2F7umZ^C_jGX#
j(GX2ekYHV$kio>jw1<IF`tIWiKq&@KS3j3^P6<r_F*+3V

literal 0
HcmV?d00001

diff --git a/mozilla/content/canvas/test/image_red-16x16.png b/mozilla/content/canvas/test/image_red-16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..9038fef784dacafdcfdce03fb12b90647bb52d2e
GIT binary patch
literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^0w65F1SAhIZYc#)oCO|{#X#BvjNMLV+kphj3LMjc
zG*~r5%(1nHfgE{H7sn8b)5(AS&u?7T(7Ekcf0RMi!4<5F#d@L~WEmJLmNUsc;ZKYN
PDrN9=^>bP0l+XkK&)6W)

literal 0
HcmV?d00001

diff --git a/mozilla/content/canvas/test/image_red.png b/mozilla/content/canvas/test/image_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6e195d59cce3c15ef12512bb58ed4f409eb95ae
GIT binary patch
literal 87
zcmeAS@N?(olHy`uVBq!ia0vp^DL`z*$P6SW{C@KnNHGWagt-1^V32&oX%6J_d%8G=
jXow~!NU$zW$Y5e%+QYyoefRMMpcI3rtDnm{r-UW|6k!xK

literal 0
HcmV?d00001

diff --git a/mozilla/content/canvas/test/image_redtransparent.png b/mozilla/content/canvas/test/image_redtransparent.png
new file mode 100644
index 0000000000000000000000000000000000000000..75da08c3d6672e3db0a3fb43394edf42271e7175
GIT binary patch
literal 109
zcmeAS@N?(olHy`uVBq!ia0vp^DL`z*$P6SW{C@KnNU;U@gt#&=GyG>@h>8FH2`Iu?
z666=m;PC858jvIE>EaloaX$G6KO4J*Lc$dDQ_@B@3~Z|cQtGFs8~`d{@O1TaS?83{
F1ORLq9D)D<

literal 0
HcmV?d00001

diff --git a/mozilla/content/canvas/test/image_rgrg-256x256.png b/mozilla/content/canvas/test/image_rgrg-256x256.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6fba3daa5dfc788eaeedb73636e82abfedc8ae5
GIT binary patch
literal 131
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K585o&?RN5XZRUpL{;1lA?@E-^nF3$E^2NbdJ
zba4#HxcBygq7VZE$Kefs|6hKPZW*&`@vN1XK>A@orcocp1kyImtX-KO9z9rOVgwTP
MboFyt=akR{0Mu9^N&o-=

literal 0
HcmV?d00001

diff --git a/mozilla/content/canvas/test/image_transparent.png b/mozilla/content/canvas/test/image_transparent.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b498699a80d9189af3aad09ae9e530fe23ab069
GIT binary patch
literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^DL`z*$P6SW{C@KnNHGWagt!9f<yE$~fD~g%kY6x^
u!?PP{Kn}mBi(`n!`Q!u%*2M`KObkqW7#MRW$(8`67(8A5T-G@yGywoa#TVWH

literal 0
HcmV?d00001

diff --git a/mozilla/content/canvas/test/image_transparent50.png b/mozilla/content/canvas/test/image_transparent50.png
new file mode 100644
index 0000000000000000000000000000000000000000..55f8e69325bc61ff83f769a6524f7f9c3310be1f
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^DL`z*!3HE(nbz$CQc0dJjv*Dd-d;3hWH8`3a$xzf
ziF{&KMlmW+vL^MN`=Z03q~O59($T;mD4@VZ2K&oxrrKi0N1NE}*nze&c)I$ztaD0e
F0st6CB*y>%

literal 0
HcmV?d00001

diff --git a/mozilla/content/canvas/test/image_yellow.png b/mozilla/content/canvas/test/image_yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..51e8aaf38c1b3a105fc6038c93b5648a4bf9efd4
GIT binary patch
literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^DL`z*$P6SW{C@KnNHGWagt-3y&(L-3iz|>T?&;zf
qQW5v|03$Du=V0(R_;h0NA~Qy&Jq(P_g*_*Mf()LnelF{r5}E*PXBuY!

literal 0
HcmV?d00001

diff --git a/mozilla/content/canvas/test/image_yellow75.png b/mozilla/content/canvas/test/image_yellow75.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bb82c9834790bfeb1a65cf2ef202dc63d2ebac4
GIT binary patch
literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^DL`z*!3HE(nbz$CQn8*cjv*CsZ!a1$GB9v3E4-CI
zm9e>LIeW;0$+N1Oi#eQH6j&6U1eBlzhhUR{B7|`45NP3m5Fk}9Py(*hN#GC@Lu;q(
TYk|aYphXOxu6{1-oD!M<5gsEm

literal 0
HcmV?d00001

diff --git a/mozilla/content/canvas/test/test_2d.canvas.readonly.html b/mozilla/content/canvas/test/test_2d.canvas.readonly.html
new file mode 100644
index 00000000000..a42bd70caa4
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.canvas.readonly.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.canvas.readonly</title>
+<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 c = document.createElement('canvas');
+var d = ctx.canvas;
+try { ctx.canvas = c; } catch (e) {} // not specified whether this throws, I think
+ok(ctx.canvas === d, "ctx.canvas === d");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.canvas.reference.html b/mozilla/content/canvas/test/test_2d.canvas.reference.html
new file mode 100644
index 00000000000..2ad2739eef9
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.canvas.reference.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.canvas.reference</title>
+<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');
+
+ok(ctx.canvas === canvas, "ctx.canvas === canvas");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.clearRect.basic.html b/mozilla/content/canvas/test/test_2d.clearRect.basic.html
new file mode 100644
index 00000000000..0f0c816daee
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.clearRect.basic.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.clearRect.clip.html b/mozilla/content/canvas/test/test_2d.clearRect.clip.html
new file mode 100644
index 00000000000..a54dc45ed55
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.clearRect.clip.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(0, 0, 16, 16);
+ctx.clip();
+
+ctx.clearRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.clearRect.globalalpha.html b/mozilla/content/canvas/test/test_2d.clearRect.globalalpha.html
new file mode 100644
index 00000000000..386db5f416a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.clearRect.globalalpha.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.clearRect.globalcomposite.html b/mozilla/content/canvas/test/test_2d.clearRect.globalcomposite.html
new file mode 100644
index 00000000000..010fdf8ae80
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.clearRect.globalcomposite.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.clearRect.path.html b/mozilla/content/canvas/test/test_2d.clearRect.path.html
new file mode 100644
index 00000000000..9879b4a6616
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.clearRect.path.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.beginPath();
+ctx.rect(0, 0, 100, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.clearRect.shadow.html b/mozilla/content/canvas/test/test_2d.clearRect.shadow.html
new file mode 100644
index 00000000000..d47b894ce73
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.clearRect.shadow.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#f00';
+ctx.shadowBlur = 0;
+ctx.shadowOffsetX = 0;
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.clearRect.transform.html b/mozilla/content/canvas/test/test_2d.clearRect.transform.html
new file mode 100644
index 00000000000..018ba4b28ff
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.clearRect.transform.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.scale(10, 10);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.clearRect.zero.html b/mozilla/content/canvas/test/test_2d.clearRect.zero.html
new file mode 100644
index 00000000000..f0d57939bee
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.clearRect.zero.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.clearRect(0, 0, 100, 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.globalAlpha.canvas.html b/mozilla/content/canvas/test/test_2d.composite.globalAlpha.canvas.html
new file mode 100644
index 00000000000..dad1f47884c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.globalAlpha.canvas.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.globalAlpha.canvaspattern.html b/mozilla/content/canvas/test/test_2d.composite.globalAlpha.canvaspattern.html
new file mode 100644
index 00000000000..2f1d22a5b7f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.globalAlpha.canvaspattern.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.globalAlpha.canvaspattern</title>
+<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;
+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);
+}
+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 () {
+
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = ctx.createPattern(canvas2, 'no-repeat');
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.globalAlpha.default.html b/mozilla/content/canvas/test/test_2d.composite.globalAlpha.default.html
new file mode 100644
index 00000000000..6e73357121b
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.globalAlpha.default.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<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">
+<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');
+
+ok(ctx.globalAlpha === 1.0, "ctx.globalAlpha === 1.0");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.globalAlpha.fill.html b/mozilla/content/canvas/test/test_2d.composite.globalAlpha.fill.html
new file mode 100644
index 00000000000..5781338285b
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.globalAlpha.fill.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.globalAlpha.image.html b/mozilla/content/canvas/test/test_2d.composite.globalAlpha.image.html
new file mode 100644
index 00000000000..98a49a5cbdd
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.globalAlpha.image.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.globalAlpha.imagepattern.html b/mozilla/content/canvas/test/test_2d.composite.globalAlpha.imagepattern.html
new file mode 100644
index 00000000000..cebb2621cb9
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.globalAlpha.imagepattern.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.composite.globalAlpha.imagepattern</title>
+<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;
+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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = ctx.createPattern(document.getElementById('red.png'), 'no-repeat');
+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();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.globalAlpha.range.html b/mozilla/content/canvas/test/test_2d.composite.globalAlpha.range.html
new file mode 100644
index 00000000000..0e60f9312f0
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.globalAlpha.range.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<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">
+<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.globalAlpha = 0.5;
+var a = ctx.globalAlpha; // might not be exactly 0.5, if it is rounded/quantised, so remember for future comparisons
+ctx.globalAlpha = 1.1;
+ok(ctx.globalAlpha == a, "ctx.globalAlpha == a");
+ctx.globalAlpha = -0.1;
+ok(ctx.globalAlpha == a, "ctx.globalAlpha == a");
+ctx.globalAlpha = 0;
+ok(ctx.globalAlpha == 0, "ctx.globalAlpha == 0");
+ctx.globalAlpha = 1;
+ok(ctx.globalAlpha == 1, "ctx.globalAlpha == 1");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.image.copy.html b/mozilla/content/canvas/test/test_2d.composite.image.copy.html
new file mode 100644
index 00000000000..de781892fab
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.image.copy.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.image.destination-atop.html b/mozilla/content/canvas/test/test_2d.composite.image.destination-atop.html
new file mode 100644
index 00000000000..8505213a69f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.image.destination-atop.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.image.destination-in.html b/mozilla/content/canvas/test/test_2d.composite.image.destination-in.html
new file mode 100644
index 00000000000..ae4b40ca71a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.image.destination-in.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.image.destination-out.html b/mozilla/content/canvas/test/test_2d.composite.image.destination-out.html
new file mode 100644
index 00000000000..922de535983
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.image.destination-out.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.image.destination-over.html b/mozilla/content/canvas/test/test_2d.composite.image.destination-over.html
new file mode 100644
index 00000000000..2ba5dd83e20
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.image.destination-over.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.image.lighter.html b/mozilla/content/canvas/test/test_2d.composite.image.lighter.html
new file mode 100644
index 00000000000..19a587df205
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.image.lighter.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.image.source-atop.html b/mozilla/content/canvas/test/test_2d.composite.image.source-atop.html
new file mode 100644
index 00000000000..0e36fc69e74
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.image.source-atop.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.image.source-in.html b/mozilla/content/canvas/test/test_2d.composite.image.source-in.html
new file mode 100644
index 00000000000..c9fda2fc3c3
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.image.source-in.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.image.source-out.html b/mozilla/content/canvas/test/test_2d.composite.image.source-out.html
new file mode 100644
index 00000000000..b2b64404fd1
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.image.source-out.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.image.source-over.html b/mozilla/content/canvas/test/test_2d.composite.image.source-over.html
new file mode 100644
index 00000000000..9dbd6bbeee1
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.image.source-over.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.image.xor.html b/mozilla/content/canvas/test/test_2d.composite.image.xor.html
new file mode 100644
index 00000000000..0d9dce0bd80
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.image.xor.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_yellow75.png" id="yellow75.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.operation.clear.html b/mozilla/content/canvas/test/test_2d.composite.operation.clear.html
new file mode 100644
index 00000000000..02359e5dc10
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.operation.clear.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<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">
+<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.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'clear';
+todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.operation.darker.html b/mozilla/content/canvas/test/test_2d.composite.operation.darker.html
new file mode 100644
index 00000000000..913c492d709
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.operation.darker.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<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">
+<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.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'darker';
+todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.operation.default.html b/mozilla/content/canvas/test/test_2d.composite.operation.default.html
new file mode 100644
index 00000000000..a9cb85a0a30
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.operation.default.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<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">
+<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');
+
+ok(ctx.globalCompositeOperation == 'source-over', "ctx.globalCompositeOperation == 'source-over'");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.operation.get.html b/mozilla/content/canvas/test/test_2d.composite.operation.get.html
new file mode 100644
index 00000000000..46c862e9eec
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.operation.get.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<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">
+<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 modes = ['source-atop', 'source-in', 'source-out', 'source-over',
+    'destination-atop', 'destination-in', 'destination-out', 'destination-over',
+    'lighter', 'copy', 'xor'];
+for (var i = 0; i < modes.length; ++i)
+{
+    ctx.globalCompositeOperation = modes[i];
+    ok(ctx.globalCompositeOperation == modes[i], "ctx.globalCompositeOperation == modes[\""+(i)+"\"]");
+}
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.operation.over.html b/mozilla/content/canvas/test/test_2d.composite.operation.over.html
new file mode 100644
index 00000000000..7e8637c7676
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.operation.over.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<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">
+<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.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'over';
+todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.solid.copy.html b/mozilla/content/canvas/test/test_2d.composite.solid.copy.html
new file mode 100644
index 00000000000..efb73281022
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.solid.copy.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.solid.destination-atop.html b/mozilla/content/canvas/test/test_2d.composite.solid.destination-atop.html
new file mode 100644
index 00000000000..e794c42b453
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.solid.destination-atop.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.solid.destination-in.html b/mozilla/content/canvas/test/test_2d.composite.solid.destination-in.html
new file mode 100644
index 00000000000..70efd0ff678
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.solid.destination-in.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.solid.destination-out.html b/mozilla/content/canvas/test/test_2d.composite.solid.destination-out.html
new file mode 100644
index 00000000000..0ebc07549f6
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.solid.destination-out.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-out';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.solid.destination-over.html b/mozilla/content/canvas/test/test_2d.composite.solid.destination-over.html
new file mode 100644
index 00000000000..f88b1fc1d59
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.solid.destination-over.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-over';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.solid.lighter.html b/mozilla/content/canvas/test/test_2d.composite.solid.lighter.html
new file mode 100644
index 00000000000..4aac53d5e7e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.solid.lighter.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'lighter';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.solid.source-atop.html b/mozilla/content/canvas/test/test_2d.composite.solid.source-atop.html
new file mode 100644
index 00000000000..4f5cf396b99
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.solid.source-atop.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-atop';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.solid.source-in.html b/mozilla/content/canvas/test/test_2d.composite.solid.source-in.html
new file mode 100644
index 00000000000..506663879d1
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.solid.source-in.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.solid.source-out.html b/mozilla/content/canvas/test/test_2d.composite.solid.source-out.html
new file mode 100644
index 00000000000..fb6a8506766
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.solid.source-out.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.solid.source-over.html b/mozilla/content/canvas/test/test_2d.composite.solid.source-over.html
new file mode 100644
index 00000000000..b47a2da268f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.solid.source-over.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-over';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.transparent.copy.html b/mozilla/content/canvas/test/test_2d.composite.transparent.copy.html
new file mode 100644
index 00000000000..7ef2826b956
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.transparent.copy.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.transparent.destination-atop.html b/mozilla/content/canvas/test/test_2d.composite.transparent.destination-atop.html
new file mode 100644
index 00000000000..ce7caef5e40
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.transparent.destination-atop.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '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.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,127,127,191, "50,25", "0,127,127,191", 5);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.transparent.destination-in.html b/mozilla/content/canvas/test/test_2d.composite.transparent.destination-in.html
new file mode 100644
index 00000000000..cfc4d3113a1
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.transparent.destination-in.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '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.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,95, "50,25", "0,255,0,95", 5);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.transparent.destination-out.html b/mozilla/content/canvas/test/test_2d.composite.transparent.destination-out.html
new file mode 100644
index 00000000000..3f9643ed88a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.transparent.destination-out.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-out';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.transparent.destination-over.html b/mozilla/content/canvas/test/test_2d.composite.transparent.destination-over.html
new file mode 100644
index 00000000000..f5727b0a9f0
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.transparent.destination-over.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-over';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.transparent.lighter.html b/mozilla/content/canvas/test/test_2d.composite.transparent.lighter.html
new file mode 100644
index 00000000000..a8ecffda977
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.transparent.lighter.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'lighter';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.transparent.source-atop.html b/mozilla/content/canvas/test/test_2d.composite.transparent.source-atop.html
new file mode 100644
index 00000000000..b3f2f1c23e7
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.transparent.source-atop.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-atop';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.transparent.source-in.html b/mozilla/content/canvas/test/test_2d.composite.transparent.source-in.html
new file mode 100644
index 00000000000..39f2f478cf4
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.transparent.source-in.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '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.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,255,95, "50,25", "0,0,255,95", 5);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.transparent.source-out.html b/mozilla/content/canvas/test/test_2d.composite.transparent.source-out.html
new file mode 100644
index 00000000000..fcc766039bc
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.transparent.source-out.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '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.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,255,95, "50,25", "0,0,255,95", 5);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.transparent.source-over.html b/mozilla/content/canvas/test/test_2d.composite.transparent.source-over.html
new file mode 100644
index 00000000000..f3855c0bb1d
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.transparent.source-over.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-over';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.composite.transparent.xor.html b/mozilla/content/canvas/test/test_2d.composite.transparent.xor.html
new file mode 100644
index 00000000000..839a67ac013
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.composite.transparent.xor.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.3arg.html b/mozilla/content/canvas/test/test_2d.drawImage.3arg.html
new file mode 100644
index 00000000000..9eacd9eab75
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.3arg.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.drawImage(document.getElementById('green.png'), 0, 0);
+ctx.drawImage(document.getElementById('red.png'), -100, 0);
+ctx.drawImage(document.getElementById('red.png'), 100, 0);
+ctx.drawImage(document.getElementById('red.png'), 0, -50);
+ctx.drawImage(document.getElementById('red.png'), 0, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.5arg.html b/mozilla/content/canvas/test/test_2d.drawImage.5arg.html
new file mode 100644
index 00000000000..9258cf6c703
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.5arg.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green.png'), 50, 0, 50, 50);
+ctx.drawImage(document.getElementById('red.png'), 0, 0, 50, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.9arg.basic.html b/mozilla/content/canvas/test/test_2d.drawImage.9arg.basic.html
new file mode 100644
index 00000000000..ed1d2490653
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.9arg.basic.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green.png'), 0, 0, 100, 50, 0, 0, 100, 50);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.9arg.destpos.html b/mozilla/content/canvas/test/test_2d.drawImage.9arg.destpos.html
new file mode 100644
index 00000000000..d0e15da9a59
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.9arg.destpos.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green.png'), 0, 0, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(document.getElementById('red.png'), 0, 0, 100, 50, -100, 0, 100, 50);
+ctx.drawImage(document.getElementById('red.png'), 0, 0, 100, 50, 100, 0, 100, 50);
+ctx.drawImage(document.getElementById('red.png'), 0, 0, 100, 50, 0, -50, 100, 50);
+ctx.drawImage(document.getElementById('red.png'), 0, 0, 100, 50, 0, 50, 100, 50);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.9arg.destsize.html b/mozilla/content/canvas/test/test_2d.drawImage.9arg.destsize.html
new file mode 100644
index 00000000000..68a1ab4f161
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.9arg.destsize.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green.png'), 1, 1, 1, 1, 0, 0, 100, 50);
+ctx.drawImage(document.getElementById('red.png'), 0, 0, 100, 50, -50, 0, 50, 50);
+ctx.drawImage(document.getElementById('red.png'), 0, 0, 100, 50, 100, 0, 50, 50);
+ctx.drawImage(document.getElementById('red.png'), 0, 0, 100, 50, 0, -25, 100, 25);
+ctx.drawImage(document.getElementById('red.png'), 0, 0, 100, 50, 0, 50, 100, 25);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.9arg.sourcepos.html b/mozilla/content/canvas/test/test_2d.drawImage.9arg.sourcepos.html
new file mode 100644
index 00000000000..3ec1dfa19b7
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.9arg.sourcepos.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('rgrg-256x256.png'), 140, 20, 100, 50, 0, 0, 100, 50);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_rgrg-256x256.png" id="rgrg-256x256.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.9arg.sourcesize.html b/mozilla/content/canvas/test/test_2d.drawImage.9arg.sourcesize.html
new file mode 100644
index 00000000000..8d61146d9d7
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.9arg.sourcesize.html
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('rgrg-256x256.png'), 0, 0, 256, 256, 0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 51, 26);
+ctx.fillRect(49, 24, 51, 26);
+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);
+isPixel(ctx, 20,20, 0,255,0,255, "20,20", "0,255,0,255", 2);
+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();
+});
+</script>
+<img src="image_rgrg-256x256.png" id="rgrg-256x256.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.alpha.html b/mozilla/content/canvas/test/test_2d.drawImage.alpha.html
new file mode 100644
index 00000000000..d93018c97ef
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.alpha.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.broken.html b/mozilla/content/canvas/test/test_2d.drawImage.broken.html
new file mode 100644
index 00000000000..ce2ba752ad6
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.broken.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<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">
+<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 img = document.getElementById('broken.png');
+todo(img.complete === false, "img.complete === false");
+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();
+});
+</script>
+<img src="image_broken.png" id="broken.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.clip.html b/mozilla/content/canvas/test/test_2d.drawImage.clip.html
new file mode 100644
index 00000000000..94f6729220c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.clip.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.rect(-10, -10, 1, 1);
+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();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.composite.html b/mozilla/content/canvas/test/test_2d.drawImage.composite.html
new file mode 100644
index 00000000000..bd4c3f6759a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.composite.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.floatsource.html b/mozilla/content/canvas/test/test_2d.drawImage.floatsource.html
new file mode 100644
index 00000000000..a4d9ea918c4
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.floatsource.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.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();
+});
+</script>
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.incomplete.html b/mozilla/content/canvas/test/test_2d.drawImage.incomplete.html
new file mode 100644
index 00000000000..9e81d4ae25f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.incomplete.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<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">
+<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 img = new Image();
+todo(img.complete === false, "img.complete === false");
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.negativedest.html b/mozilla/content/canvas/test/test_2d.drawImage.negativedest.html
new file mode 100644
index 00000000000..5f6a2d042a5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.negativedest.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML>
+<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">
+<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 = '#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");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.negativesource.html b/mozilla/content/canvas/test/test_2d.drawImage.negativesource.html
new file mode 100644
index 00000000000..8bd458b4ed3
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.negativesource.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<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">
+<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 = '#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");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.null.html b/mozilla/content/canvas/test/test_2d.drawImage.null.html
new file mode 100644
index 00000000000..f8f9b245888
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.null.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<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">
+<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.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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.outsidesource.html b/mozilla/content/canvas/test/test_2d.drawImage.outsidesource.html
new file mode 100644
index 00000000000..6b1b542e8bb
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.outsidesource.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.drawImage(document.getElementById('green.png'), 10.5, 10.5, 89.5, 39.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");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red.png'), 0, -0.001, 100, 50, 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, 100.001, 50, 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, 100, 50.001, 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'), 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");
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+
+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/mozilla/content/canvas/test/test_2d.drawImage.path.html b/mozilla/content/canvas/test/test_2d.drawImage.path.html
new file mode 100644
index 00000000000..88419ec9b7b
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.path.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.rect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.transform.html b/mozilla/content/canvas/test/test_2d.drawImage.transform.html
new file mode 100644
index 00000000000..00249513501
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.transform.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.wrongtype.html b/mozilla/content/canvas/test/test_2d.drawImage.wrongtype.html
new file mode 100644
index 00000000000..097414565fd
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.wrongtype.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML>
+<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">
+<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.drawImage(undefined, 0, 0);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(0, 0, 0);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage("", 0, 0);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.drawImage.zerosource.html b/mozilla/content/canvas/test/test_2d.drawImage.zerosource.html
new file mode 100644
index 00000000000..21e857083a0
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.drawImage.zerosource.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.drawImage.zerosource</title>
+<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;
+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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.fillRect.basic.html b/mozilla/content/canvas/test/test_2d.fillRect.basic.html
new file mode 100644
index 00000000000..2c178512d80
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillRect.basic.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillRect.clip.html b/mozilla/content/canvas/test/test_2d.fillRect.clip.html
new file mode 100644
index 00000000000..9aa6a4784f5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillRect.clip.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(0, 0, 16, 16);
+ctx.clip();
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillRect.negative.html b/mozilla/content/canvas/test/test_2d.fillRect.negative.html
new file mode 100644
index 00000000000..2a14934d161
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillRect.negative.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<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">
+<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.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");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillRect.path.html b/mozilla/content/canvas/test/test_2d.fillRect.path.html
new file mode 100644
index 00000000000..bbf6522b5f5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillRect.path.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.beginPath();
+ctx.rect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 16, 16);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillRect.shadow.html b/mozilla/content/canvas/test/test_2d.fillRect.shadow.html
new file mode 100644
index 00000000000..990da6f7eb5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillRect.shadow.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.shadowBlur = 0;
+ctx.shadowOffsetX = 0;
+ctx.shadowOffsetY = 50;
+
+// Shadows are optional, so just test that if they apply to fill() then they apply to fillRect() too
+ctx.beginPath();
+ctx.rect(0, -50, 100, 50);
+ctx.shadowColor = '#f00';
+ctx.fill();
+
+ctx.shadowColor = '#0f0';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillRect.transform.html b/mozilla/content/canvas/test/test_2d.fillRect.transform.html
new file mode 100644
index 00000000000..57e3b912324
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillRect.transform.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.scale(10, 10);
+ctx.translate(0, 5);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillRect.zero.html b/mozilla/content/canvas/test/test_2d.fillRect.zero.html
new file mode 100644
index 00000000000..ee6e7f67132
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillRect.zero.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.default.html b/mozilla/content/canvas/test/test_2d.fillStyle.default.html
new file mode 100644
index 00000000000..d2bfe883643
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.default.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<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">
+<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');
+
+ok(ctx.fillStyle == '#000000', "ctx.fillStyle == '#000000'");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.get.semitransparent.html b/mozilla/content/canvas/test/test_2d.fillStyle.get.semitransparent.html
new file mode 100644
index 00000000000..5374f5ccd2a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.get.semitransparent.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<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">
+<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 = '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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.get.solid.html b/mozilla/content/canvas/test/test_2d.fillStyle.get.solid.html
new file mode 100644
index 00000000000..06164aac036
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.get.solid.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<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">
+<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 = '#fa0';
+ok(ctx.fillStyle === '#ffaa00', "ctx.fillStyle === '#ffaa00'");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.get.transparent.html b/mozilla/content/canvas/test/test_2d.fillStyle.get.transparent.html
new file mode 100644
index 00000000000..3d721c4f23c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.get.transparent.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<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">
+<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 = '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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.invalidstring.html b/mozilla/content/canvas/test/test_2d.fillStyle.invalidstring.html
new file mode 100644
index 00000000000..a51b09be453
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.invalidstring.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.invalidtype.html b/mozilla/content/canvas/test/test_2d.fillStyle.invalidtype.html
new file mode 100644
index 00000000000..34e9ba45de4
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.invalidtype.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.flavor.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.flavor.html
new file mode 100644
index 00000000000..20ea7d6a227
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.flavor.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.fillStyle.parse.flavor</title>
+<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 = '#f00';
+ctx.fillStyle = 'flavor';
+ok(ctx.fillStyle =~ /^#(?!(FF0000|ff0000|f00)$)/, "ctx.fillStyle =~ /^#(?!(FF0000|ff0000|f00)$)/"); // test that it's not red
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.hex3.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hex3.html
new file mode 100644
index 00000000000..a529282b806
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hex3.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.hex6.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hex6.html
new file mode 100644
index 00000000000..d8bc1a1003d
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hex6.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-1.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-1.html
new file mode 100644
index 00000000000..6797f876db5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-1.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-2.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-2.html
new file mode 100644
index 00000000000..88e53e9e4d8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-2.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-3.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-3.html
new file mode 100644
index 00000000000..b5e03242856
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-3.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-4.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-4.html
new file mode 100644
index 00000000000..76910a51c68
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-4.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-5.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-5.html
new file mode 100644
index 00000000000..c7f27e15c8e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsl-5.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsla-1.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsla-1.html
new file mode 100644
index 00000000000..ecfcc380245
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsla-1.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsla-2.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsla-2.html
new file mode 100644
index 00000000000..0dad0417716
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.hsla-2.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.html4.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.html4.html
new file mode 100644
index 00000000000..fbea2671acd
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.html4.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hex3.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hex3.html
new file mode 100644
index 00000000000..56bbee4035c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hex3.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = '#g00'; } 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hex6.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hex6.html
new file mode 100644
index 00000000000..30630b77aa3
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hex6.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = '#fg0000'; } 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-1.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-1.html
new file mode 100644
index 00000000000..c4ea85ca4f8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-1.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = 'hsl(0%, 100%, 50%)'; } 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-2.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-2.html
new file mode 100644
index 00000000000..acf08e45d17
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-2.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = 'hsl(z, 100%, 50%)'; } 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-3.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-3.html
new file mode 100644
index 00000000000..2ba55f9ecb3
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-3.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = 'hsl(0, 0, 50%)'; } 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-4.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-4.html
new file mode 100644
index 00000000000..a38e8c2f1eb
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-4.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = 'hsl(0, 100%, 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-1.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-1.html
new file mode 100644
index 00000000000..cd89fb57c16
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-1.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = 'rgb(255.0, 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-2.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-2.html
new file mode 100644
index 00000000000..8c1b4b2e388
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-2.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = 'rgb(255, 0.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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-3.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-3.html
new file mode 100644
index 00000000000..655f749c5af
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-3.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = 'rgb(255.0, 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-4.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-4.html
new file mode 100644
index 00000000000..0b77a0938a3
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-4.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = 'rgb(100%, 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-1.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-1.html
new file mode 100644
index 00000000000..908e6fecdb4
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-1.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = 'rgba(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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-2.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-2.html
new file mode 100644
index 00000000000..4a4bc20b398
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-2.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = 'rgba(255.0, 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-3.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-3.html
new file mode 100644
index 00000000000..84ae5f6e792
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-3.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = 'rgba(100%, 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-4.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-4.html
new file mode 100644
index 00000000000..f86cefa1ec8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-4.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = 'rgba(255, 0, 0, 100%)'; } 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-5.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-5.html
new file mode 100644
index 00000000000..f34be749eb8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-5.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+try { ctx.fillStyle = 'rgba(255, 0, 0, 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-1.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-1.html
new file mode 100644
index 00000000000..9833b3e048e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-1.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-2.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-2.html
new file mode 100644
index 00000000000..a601d4e6298
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-2.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-num.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-num.html
new file mode 100644
index 00000000000..6948a0d7d85
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-num.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-percent.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-percent.html
new file mode 100644
index 00000000000..149228c9918
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgb-percent.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-1.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-1.html
new file mode 100644
index 00000000000..636b38b5ce9
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-1.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-2.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-2.html
new file mode 100644
index 00000000000..52cafc36b7e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-2.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-num-1.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-num-1.html
new file mode 100644
index 00000000000..7f7597e0df8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-num-1.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-num-2.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-num-2.html
new file mode 100644
index 00000000000..33661875d1a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-num-2.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-percent.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-percent.html
new file mode 100644
index 00000000000..a4482ae0772
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-percent.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-1.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-1.html
new file mode 100644
index 00000000000..9599fe4119a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-1.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-2.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-2.html
new file mode 100644
index 00000000000..4d37945ce49
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-2.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.svg-1.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.svg-1.html
new file mode 100644
index 00000000000..9dd879174e0
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.svg-1.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.svg-2.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.svg-2.html
new file mode 100644
index 00000000000..ca7e69db6eb
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.svg-2.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.system.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.system.html
new file mode 100644
index 00000000000..11a542e033b
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.system.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<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">
+<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 = '#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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.transparent-1.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.transparent-1.html
new file mode 100644
index 00000000000..0f453c443c8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.transparent-1.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.fillStyle.parse.transparent-2.html b/mozilla/content/canvas/test/test_2d.fillStyle.parse.transparent-2.html
new file mode 100644
index 00000000000..e87591ee22c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.fillStyle.parse.transparent-2.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.getcontext.exists.html b/mozilla/content/canvas/test/test_2d.getcontext.exists.html
new file mode 100644
index 00000000000..7e1719459e5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.getcontext.exists.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.getcontext.exists</title>
+<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');
+
+ok(canvas.getContext('2d') !== null, "canvas.getContext('2d') !== null");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.getcontext.shared.html b/mozilla/content/canvas/test/test_2d.getcontext.shared.html
new file mode 100644
index 00000000000..3447e83760e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.getcontext.shared.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.getcontext.shared</title>
+<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;
+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');
+
+var ctx2 = canvas.getContext('2d');
+ctx.fillStyle = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.getcontext.unique.html b/mozilla/content/canvas/test/test_2d.getcontext.unique.html
new file mode 100644
index 00000000000..7ef820a1a79
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.getcontext.unique.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.getcontext.unique</title>
+<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');
+
+ok(canvas.getContext('2d') === canvas.getContext('2d'), "canvas.getContext('2d') === canvas.getContext('2d')");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.empty.html b/mozilla/content/canvas/test/test_2d.gradient.empty.html
new file mode 100644
index 00000000000..00c3d1e7b69
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.empty.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+var g = ctx.createLinearGradient(0, 0, 0, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.interpolate.alpha.html b/mozilla/content/canvas/test/test_2d.gradient.interpolate.alpha.html
new file mode 100644
index 00000000000..8cfbb901871
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.interpolate.alpha.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#ff0';
+ctx.fillRect(0, 0, 100, 50);
+var g = ctx.createLinearGradient(0, 0, 100, 0);
+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", 2);
+isPixel(ctx, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 2);
+isPixel(ctx, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 2);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.interpolate.colour.html b/mozilla/content/canvas/test/test_2d.gradient.interpolate.colour.html
new file mode 100644
index 00000000000..eb1cfacbf08
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.interpolate.colour.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+var g = ctx.createLinearGradient(0, 0, 100, 0);
+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", 2);
+isPixel(ctx, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 2);
+isPixel(ctx, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 2);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.interpolate.colouralpha.html b/mozilla/content/canvas/test/test_2d.gradient.interpolate.colouralpha.html
new file mode 100644
index 00000000000..7e56e8578bb
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.interpolate.colouralpha.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+var g = ctx.createLinearGradient(0, 0, 100, 0);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.interpolate.multiple.html b/mozilla/content/canvas/test/test_2d.gradient.interpolate.multiple.html
new file mode 100644
index 00000000000..cb2131c261b
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.interpolate.multiple.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+canvas.width = 200;
+var g = ctx.createLinearGradient(0, 0, 200, 0);
+g.addColorStop(0, '#ff0');
+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", 2);
+isPixel(ctx, 100,25, 0,255,255,255, "100,25", "0,255,255,255", 2);
+isPixel(ctx, 150,25, 127,127,255,255, "150,25", "127,127,255,255", 2);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.interpolate.outside.html b/mozilla/content/canvas/test/test_2d.gradient.interpolate.outside.html
new file mode 100644
index 00000000000..6a9f2895104
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.interpolate.outside.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createLinearGradient(25, 0, 75, 0);
+g.addColorStop(0.4, '#0f0');
+g.addColorStop(0.6, '#0f0');
+
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.interpolate.overlap.html b/mozilla/content/canvas/test/test_2d.gradient.interpolate.overlap.html
new file mode 100644
index 00000000000..e4d9ebcb0c5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.interpolate.overlap.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+canvas.width = 200;
+var g = ctx.createLinearGradient(0, 0, 200, 0);
+g.addColorStop(0, '#f00');
+g.addColorStop(0, '#ff0');
+g.addColorStop(0.25, '#00f');
+g.addColorStop(0.25, '#0f0');
+g.addColorStop(0.25, '#0f0');
+g.addColorStop(0.25, '#0f0');
+g.addColorStop(0.25, '#ff0');
+g.addColorStop(0.5, '#00f');
+g.addColorStop(0.5, '#0f0');
+g.addColorStop(0.75, '#00f');
+g.addColorStop(0.75, '#f00');
+g.addColorStop(0.75, '#ff0');
+g.addColorStop(0.5, '#0f0');
+g.addColorStop(0.5, '#0f0');
+g.addColorStop(0.5, '#ff0');
+g.addColorStop(1, '#00f');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 200, 50);
+isPixel(ctx, 49,25, 0,0,255,255, "49,25", "0,0,255,255", 16);
+isPixel(ctx, 51,25, 255,255,0,255, "51,25", "255,255,0,255", 16);
+isPixel(ctx, 99,25, 0,0,255,255, "99,25", "0,0,255,255", 16);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.interpolate.overlap2.html b/mozilla/content/canvas/test/test_2d.gradient.interpolate.overlap2.html
new file mode 100644
index 00000000000..f02dff75ded
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.interpolate.overlap2.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+var g = ctx.createLinearGradient(0, 0, 100, 0);
+var ps = [ 0, 1/10, 1/4, 1/3, 1/2, 3/4, 1 ];
+for (var p = 0; p < ps.length; ++p)
+{
+        g.addColorStop(ps[p], '#0f0');
+        for (var i = 0; i < 15; ++i)
+                g.addColorStop(ps[p], '#f00');
+        g.addColorStop(ps[p], '#0f0');
+}
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+isPixel(ctx, 30,25, 0,255,0,255, "30,25", "0,255,0,255", 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.interpolate.solid.html b/mozilla/content/canvas/test/test_2d.gradient.interpolate.solid.html
new file mode 100644
index 00000000000..4e45f5702a0
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.interpolate.solid.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+var g = ctx.createLinearGradient(0, 0, 100, 0);
+g.addColorStop(0, '#0f0');
+g.addColorStop(1, '#0f0');
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.interpolate.vertical.html b/mozilla/content/canvas/test/test_2d.gradient.interpolate.vertical.html
new file mode 100644
index 00000000000..feba6db1522
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.interpolate.vertical.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+var g = ctx.createLinearGradient(0, 0, 0, 50);
+g.addColorStop(0, '#ff0');
+g.addColorStop(1, '#00f');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.interpolate.zerosize.html b/mozilla/content/canvas/test/test_2d.gradient.interpolate.zerosize.html
new file mode 100644
index 00000000000..82ed77295fe
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.interpolate.zerosize.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createLinearGradient(50, 25, 50, 25); // zero-length line (undefined direction)
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.object.compare.html b/mozilla/content/canvas/test/test_2d.gradient.object.compare.html
new file mode 100644
index 00000000000..4e7f909a34a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.object.compare.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<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">
+<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 g1 = ctx.createLinearGradient(0, 0, 100, 0);
+var g2 = ctx.createLinearGradient(0, 0, 100, 0);
+ok(g1 !== g2, "g1 !== g2");
+ctx.fillStyle = g1;
+ok(ctx.fillStyle === g1, "ctx.fillStyle === g1");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.object.crosscanvas.html b/mozilla/content/canvas/test/test_2d.gradient.object.crosscanvas.html
new file mode 100644
index 00000000000..fe3b9d5e44b
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.object.crosscanvas.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+var g = document.createElement('canvas').getContext('2d').createLinearGradient(0, 0, 100, 0);
+g.addColorStop(0, '#0f0');
+g.addColorStop(1, '#0f0');
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.object.invalidcolour.html b/mozilla/content/canvas/test/test_2d.gradient.object.invalidcolour.html
new file mode 100644
index 00000000000..a309dce252a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.object.invalidcolour.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<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">
+<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 g = ctx.createLinearGradient(0, 0, 100, 0);
+var _thrown = undefined; try {
+  g.addColorStop(0, "");
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.object.invalidoffset.html b/mozilla/content/canvas/test/test_2d.gradient.object.invalidoffset.html
new file mode 100644
index 00000000000..92d23095b96
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.object.invalidoffset.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<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">
+<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 g = ctx.createLinearGradient(0, 0, 100, 0);
+var _thrown = undefined; try {
+  g.addColorStop(-1, '#000');
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  g.addColorStop(2, '#000');
+} 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");
+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");
+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");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.object.return.html b/mozilla/content/canvas/test/test_2d.gradient.object.return.html
new file mode 100644
index 00000000000..e13871c3466
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.object.return.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.object.return</title>
+<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 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");
+
+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");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.object.update.html b/mozilla/content/canvas/test/test_2d.gradient.object.update.html
new file mode 100644
index 00000000000..c7e12d3640a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.object.update.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+var g = ctx.createLinearGradient(-100, 0, 200, 0);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+g.addColorStop(0.1, '#0f0');
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.radial.cone.bottom.html b/mozilla/content/canvas/test/test_2d.gradient.radial.cone.bottom.html
new file mode 100644
index 00000000000..f7e8e3ce739
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.radial.cone.bottom.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(210, 25, 100, 230, 25, 101);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.radial.cone.cylinder.html b/mozilla/content/canvas/test/test_2d.gradient.radial.cone.cylinder.html
new file mode 100644
index 00000000000..f43a6719f57
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.radial.cone.cylinder.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(210, 25, 100, 230, 25, 100);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.radial.cone.front.html b/mozilla/content/canvas/test/test_2d.gradient.radial.cone.front.html
new file mode 100644
index 00000000000..8b0e437ee9c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.radial.cone.front.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(311, 25, 10, 210, 25, 100);
+g.addColorStop(0, '#f00');
+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", 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.radial.cone.shape1.html b/mozilla/content/canvas/test/test_2d.gradient.radial.cone.shape1.html
new file mode 100644
index 00000000000..158d42261de
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.radial.cone.shape1.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+var tol = 1; // tolerance to avoid antialiasing artifacts
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(30+tol, 40);
+ctx.lineTo(110, -20+tol);
+ctx.lineTo(110, 100-tol);
+ctx.fill();
+
+var g = ctx.createRadialGradient(30+10*5/2, 40, 10*3/2, 30+10*15/4, 40, 10*9/4);
+g.addColorStop(0, '#0f0');
+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", 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.radial.cone.top.html b/mozilla/content/canvas/test/test_2d.gradient.radial.cone.top.html
new file mode 100644
index 00000000000..66cb1bec174
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.radial.cone.top.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(230, 25, 100, 100, 25, 101);
+g.addColorStop(0, '#f00');
+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", 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.radial.inside1.html b/mozilla/content/canvas/test/test_2d.gradient.radial.inside1.html
new file mode 100644
index 00000000000..6b29177e951
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.radial.inside1.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(50, 25, 100, 50, 25, 200);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.radial.inside2.html b/mozilla/content/canvas/test/test_2d.gradient.radial.inside2.html
new file mode 100644
index 00000000000..1f047a91011
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.radial.inside2.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(50, 25, 200, 50, 25, 100);
+g.addColorStop(0, '#f00');
+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", 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.radial.inside3.html b/mozilla/content/canvas/test/test_2d.gradient.radial.inside3.html
new file mode 100644
index 00000000000..5e52c8d80a0
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.radial.inside3.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(50, 25, 200, 50, 25, 100);
+g.addColorStop(0, '#f00');
+g.addColorStop(0.993, '#f00');
+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", 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.radial.invalid.html b/mozilla/content/canvas/test/test_2d.gradient.radial.invalid.html
new file mode 100644
index 00000000000..e1bc9a74006
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.radial.invalid.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.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">
+<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.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(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, 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, 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, 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, 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, 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");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.radial.negative.html b/mozilla/content/canvas/test/test_2d.gradient.radial.negative.html
new file mode 100644
index 00000000000..3b0ecc2bae6
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.radial.negative.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.gradient.radial.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">
+<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.createRadialGradient(0, 0, -0.1, 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, 1, 0, 0, -0.1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.gradient.radial.outside1.html b/mozilla/content/canvas/test/test_2d.gradient.radial.outside1.html
new file mode 100644
index 00000000000..423cdaab9e7
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.gradient.radial.outside1.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(200, 25, 10, 200, 25, 20);
+g.addColorStop(0, '#f00');
+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", 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.get.basic.html b/mozilla/content/canvas/test/test_2d.imageData.get.basic.html
new file mode 100644
index 00000000000..53f23bd181b
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.get.basic.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.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">
+<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');
+
+ok(ctx.getImageData(0, 0, 100, 50) !== null, "ctx.getImageData(0, 0, 100, 50) !== null");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.get.nonfinite.html b/mozilla/content/canvas/test/test_2d.imageData.get.nonfinite.html
new file mode 100644
index 00000000000..c10fc2fb5b4
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.get.nonfinite.html
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.nonfinite</title>
+<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.getImageData(Infinity, 10, 1, 1);
+} 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);
+} 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);
+} 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);
+} 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);
+} 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);
+} 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);
+} 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);
+} 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);
+} 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);
+} 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);
+} 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);
+} 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/mozilla/content/canvas/test/test_2d.imageData.get.nonpositive.html b/mozilla/content/canvas/test/test_2d.imageData.get.nonpositive.html
new file mode 100644
index 00000000000..c2b52b42a2f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.get.nonpositive.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.nonpositive</title>
+<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.getImageData(10, 10, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_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");
+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");
+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");
+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");
+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");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.get.nonpremul.html b/mozilla/content/canvas/test/test_2d.imageData.get.nonpremul.html
new file mode 100644
index 00000000000..53b6867f55a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.get.nonpremul.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.nonpremul</title>
+<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 = 'rgba(255, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+var imgdata = ctx.getImageData(10, 10, 10, 10);
+ok(imgdata.data[0] > 200, "imgdata.data[\""+(0)+"\"] > 200");
+ok(imgdata.data[1] > 200, "imgdata.data[\""+(1)+"\"] > 200");
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.get.order.alpha.html b/mozilla/content/canvas/test/test_2d.imageData.get.order.alpha.html
new file mode 100644
index 00000000000..23e6c3c8f35
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.get.order.alpha.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.order.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">
+<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 = 'rgba(0, 0, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.get.order.cols.html b/mozilla/content/canvas/test/test_2d.imageData.get.order.cols.html
new file mode 100644
index 00000000000..605c5107d75
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.get.order.cols.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.order.cols</title>
+<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 = '#fff';
+ctx.fillRect(0, 0, 100, 50);
+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");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.get.order.rgb.html b/mozilla/content/canvas/test/test_2d.imageData.get.order.rgb.html
new file mode 100644
index 00000000000..0c3cffc4d34
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.get.order.rgb.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.order.rgb</title>
+<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 = '#48c';
+ctx.fillRect(0, 0, 100, 50);
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+ok(imgdata.data[0] === 0x44, "imgdata.data[\""+(0)+"\"] === 0x44");
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.get.order.rows.html b/mozilla/content/canvas/test/test_2d.imageData.get.order.rows.html
new file mode 100644
index 00000000000..efb34007644
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.get.order.rows.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.order.rows</title>
+<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 = '#fff';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#000';
+ctx.fillRect(0, 0, 100, 2);
+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)] === 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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.get.properties.html b/mozilla/content/canvas/test/test_2d.imageData.get.properties.html
new file mode 100644
index 00000000000..7c12bcb6234
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.get.properties.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.properties</title>
+<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, 100, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.get.smallest.html b/mozilla/content/canvas/test/test_2d.imageData.get.smallest.html
new file mode 100644
index 00000000000..ada45319cd8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.get.smallest.html
@@ -0,0 +1,25 @@
+<!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/mozilla/content/canvas/test/test_2d.imageData.get.sourcepos.html b/mozilla/content/canvas/test/test_2d.imageData.get.sourcepos.html
new file mode 100644
index 00000000000..acd1b21e02e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.get.sourcepos.html
@@ -0,0 +1,29 @@
+<!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/mozilla/content/canvas/test/test_2d.imageData.get.sourcesize.html b/mozilla/content/canvas/test/test_2d.imageData.get.sourcesize.html
new file mode 100644
index 00000000000..709370f1ef5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.get.sourcesize.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.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">
+<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 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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.get.values.html b/mozilla/content/canvas/test/test_2d.imageData.get.values.html
new file mode 100644
index 00000000000..ce8b9587ff5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.get.values.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.get.values</title>
+<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] === 0, "imgdata1.data[\""+(0)+"\"] === 0");
+var imgdata2 = ctx.getImageData(30, 20, 1, 1);
+ok(imgdata2.data[0] === 255, "imgdata2.data[\""+(0)+"\"] === 255");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.put.alpha.html b/mozilla/content/canvas/test/test_2d.imageData.put.alpha.html
new file mode 100644
index 00000000000..22600cbfaf2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.put.alpha.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = 'rgba(0, 255, 0, 0.25)';
+ctx.fillRect(0, 0, 100, 50)
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.put.basic.html b/mozilla/content/canvas/test/test_2d.imageData.put.basic.html
new file mode 100644
index 00000000000..0350f22749d
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.put.basic.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#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.putImageData(imgdata, 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.put.modified.html b/mozilla/content/canvas/test/test_2d.imageData.put.modified.html
new file mode 100644
index 00000000000..5a2c2f70705
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.put.modified.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.modified</title>
+<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;
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+ctx.fillStyle = '#f00';
+ctx.fillRect(45, 20, 10, 10)
+var imgdata = ctx.getImageData(45, 20, 10, 10);
+for (var i = 0, len = imgdata.width*imgdata.height*4; i < len; i += 4)
+{
+    imgdata.data[i] = 0;
+    imgdata.data[i+1] = 255;
+}
+ctx.putImageData(imgdata, 45, 20);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.put.path.html b/mozilla/content/canvas/test/test_2d.imageData.put.path.html
new file mode 100644
index 00000000000..3f5e432fdf0
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.put.path.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.rect(0, 0, 100, 50);
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+ctx.putImageData(imgdata, 0, 0);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.put.type.correct.html b/mozilla/content/canvas/test/test_2d.imageData.put.type.correct.html
new file mode 100644
index 00000000000..7b254c16a3f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.put.type.correct.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.type.correct</title>
+<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;
+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 = '#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 };
+ctx.putImageData(imgdata2, 45, 20);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.put.type.extra.html b/mozilla/content/canvas/test/test_2d.imageData.put.type.extra.html
new file mode 100644
index 00000000000..b8c0f591d15
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.put.type.extra.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.type.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#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);
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.put.type.invalidsize.html b/mozilla/content/canvas/test/test_2d.imageData.put.type.invalidsize.html
new file mode 100644
index 00000000000..dcf88e3405d
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.put.type.invalidsize.html
@@ -0,0 +1,55 @@
+<!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/mozilla/content/canvas/test/test_2d.imageData.put.type.invalidvalues.html b/mozilla/content/canvas/test/test_2d.imageData.put.type.invalidvalues.html
new file mode 100644
index 00000000000..a051615b000
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.put.type.invalidvalues.html
@@ -0,0 +1,39 @@
+<!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/mozilla/content/canvas/test/test_2d.imageData.put.type.missing.html b/mozilla/content/canvas/test/test_2d.imageData.put.type.missing.html
new file mode 100644
index 00000000000..b00c2ec934c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.put.type.missing.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.type.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">
+<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({ 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, 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: imgdata1.height }, 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/mozilla/content/canvas/test/test_2d.imageData.put.type.onepixel.html b/mozilla/content/canvas/test/test_2d.imageData.put.type.onepixel.html
new file mode 100644
index 00000000000..07c67190841
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.put.type.onepixel.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.type.onepixel</title>
+<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.putImageData({ width: 1, height: 1, data: [0, 0, 0, 0] }, 0, 0);
+ok(true, "true"); // no exception
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.put.unaffected.html b/mozilla/content/canvas/test/test_2d.imageData.put.unaffected.html
new file mode 100644
index 00000000000..31dd9fb38e5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.put.unaffected.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#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.globalAlpha = 0.1;
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.shadowColor = '#f00';
+ctx.translate(100, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.imageData.put.unchanged.html b/mozilla/content/canvas/test/test_2d.imageData.put.unchanged.html
new file mode 100644
index 00000000000..8a87ffc5e34
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.imageData.put.unchanged.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.imageData.put.unchanged</title>
+<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 i = 0;
+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);
+    }
+}
+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)
+{
+    ok(olddata[i] === imgdata2.data[i], "olddata[\""+(i)+"\"] === imgdata2.data[\""+(i)+"\"]");
+}
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.cap.closed.html b/mozilla/content/canvas/test/test_2d.line.cap.closed.html
new file mode 100644
index 00000000000..75402ce0b37
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.cap.closed.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.cap.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineJoin = 'bevel';
+ctx.lineCap = 'square';
+ctx.lineWidth = 400;
+
+ctx.beginPath();
+ctx.moveTo(200, 200);
+ctx.lineTo(200, 1000);
+ctx.lineTo(1000, 1000);
+ctx.lineTo(1000, 200);
+ctx.closePath();
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.cap.open.html b/mozilla/content/canvas/test/test_2d.line.cap.open.html
new file mode 100644
index 00000000000..2853fd0b766
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.cap.open.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.cap.open</title>
+<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;
+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 = '#f00';
+ctx.strokeStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineJoin = 'bevel';
+ctx.lineCap = 'square';
+ctx.lineWidth = 400;
+
+ctx.beginPath();
+ctx.moveTo(200, 200);
+ctx.lineTo(200, 1000);
+ctx.lineTo(1000, 1000);
+ctx.lineTo(1000, 200);
+ctx.lineTo(200, 200);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.cap.zerobezier.round.html b/mozilla/content/canvas/test/test_2d.line.cap.zerobezier.round.html
new file mode 100644
index 00000000000..8b69da528b2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.cap.zerobezier.round.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.cap.zerobezier.round</title>
+<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;
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 150;
+ctx.lineCap = 'round';
+
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.bezierCurveTo(50, 25, 50, 25, 50, 25);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.cap.zeroline.round.html b/mozilla/content/canvas/test/test_2d.line.cap.zeroline.round.html
new file mode 100644
index 00000000000..681e3e4840c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.cap.zeroline.round.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.cap.zeroline.round</title>
+<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;
+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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 150;
+ctx.lineCap = '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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.cap.zeroline.square.html b/mozilla/content/canvas/test/test_2d.line.cap.zeroline.square.html
new file mode 100644
index 00000000000..73f3eb674ae
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.cap.zeroline.square.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.cap.zeroline.square</title>
+<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;
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.lineCap = 'square';
+
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.lineTo(50, 25);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.cross.html b/mozilla/content/canvas/test/test_2d.line.cross.html
new file mode 100644
index 00000000000..d40cb7f10f1
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.cross.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 200;
+ctx.lineJoin = 'bevel';
+
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(110, 50);
+ctx.lineTo(110, 60);
+ctx.lineTo(100, 60);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.defaults.html b/mozilla/content/canvas/test/test_2d.line.defaults.html
new file mode 100644
index 00000000000..eb05a8b94f2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.defaults.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<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">
+<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');
+
+ok(ctx.lineWidth === 1, "ctx.lineWidth === 1");
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.invalid.lineWidth.html b/mozilla/content/canvas/test/test_2d.line.invalid.lineWidth.html
new file mode 100644
index 00000000000..17158055dfa
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.invalid.lineWidth.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.invalid.lineWidth</title>
+<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.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;
+var _thrown = undefined; try {
+  ctx.lineWidth = 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;
+var _thrown = undefined; try {
+  ctx.lineWidth = -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;
+var _thrown = undefined; try {
+  ctx.lineWidth = 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");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.invalid.miterLimit.html b/mozilla/content/canvas/test/test_2d.line.invalid.miterLimit.html
new file mode 100644
index 00000000000..b14ee773de4
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.invalid.miterLimit.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.invalid.miterLimit</title>
+<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.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;
+} 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;
+} 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;
+} 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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.join.closed.html b/mozilla/content/canvas/test/test_2d.line.join.closed.html
new file mode 100644
index 00000000000..d65423c1be7
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.join.closed.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.join.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.strokeStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineJoin = 'miter';
+ctx.lineWidth = 200;
+
+ctx.beginPath();
+ctx.moveTo(100, 50);
+ctx.lineTo(100, 1000);
+ctx.lineTo(1000, 1000);
+ctx.lineTo(1000, 50);
+ctx.closePath();
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.join.open.html b/mozilla/content/canvas/test/test_2d.line.join.open.html
new file mode 100644
index 00000000000..cbf157f9593
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.join.open.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.join.open</title>
+<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;
+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 = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineJoin = 'miter';
+ctx.lineWidth = 200;
+
+ctx.beginPath();
+ctx.moveTo(100, 50);
+ctx.lineTo(100, 1000);
+ctx.lineTo(1000, 1000);
+ctx.lineTo(1000, 50);
+ctx.lineTo(100, 50);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.join.parallel.html b/mozilla/content/canvas/test/test_2d.line.join.parallel.html
new file mode 100644
index 00000000000..95e1321f432
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.join.parallel.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.join.parallel</title>
+<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;
+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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 300;
+ctx.lineJoin = 'round';
+ctx.beginPath();
+ctx.moveTo(-100, 25);
+ctx.lineTo(0, 25);
+ctx.lineTo(-100, 25);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.join.zeroline.corner.html b/mozilla/content/canvas/test/test_2d.line.join.zeroline.corner.html
new file mode 100644
index 00000000000..830ed110bbc
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.join.zeroline.corner.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.join.zeroline.corner</title>
+<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;
+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 = '#f00';
+ctx.strokeStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineJoin = 'miter';
+ctx.lineWidth = 200;
+
+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.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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.join.zeroline.join.html b/mozilla/content/canvas/test/test_2d.line.join.zeroline.join.html
new file mode 100644
index 00000000000..fa756ad326f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.join.zeroline.join.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.join.zeroline.join</title>
+<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;
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 150;
+ctx.lineJoin = 'round';
+
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.lineTo(50, 25);
+ctx.lineTo(50, 25);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.lineCap.butt.html b/mozilla/content/canvas/test/test_2d.line.lineCap.butt.html
new file mode 100644
index 00000000000..38c4770a7f2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.lineCap.butt.html
@@ -0,0 +1,68 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.lineCap.butt</title>
+<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;
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineCap = 'butt';
+ctx.lineWidth = 20;
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+ctx.fillRect(15, 15, 20, 20);
+ctx.beginPath();
+ctx.moveTo(25, 15);
+ctx.lineTo(25, 35);
+ctx.stroke();
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(75, 15);
+ctx.lineTo(75, 35);
+ctx.stroke();
+ctx.fillRect(65, 15, 20, 20);
+
+isPixel(ctx, 25,14, 0,255,0,255, "25,14", "0,255,0,255", 0);
+isPixel(ctx, 25,15, 0,255,0,255, "25,15", "0,255,0,255", 0);
+isPixel(ctx, 25,16, 0,255,0,255, "25,16", "0,255,0,255", 0);
+isPixel(ctx, 25,34, 0,255,0,255, "25,34", "0,255,0,255", 0);
+isPixel(ctx, 25,35, 0,255,0,255, "25,35", "0,255,0,255", 0);
+isPixel(ctx, 25,36, 0,255,0,255, "25,36", "0,255,0,255", 0);
+
+isPixel(ctx, 75,14, 0,255,0,255, "75,14", "0,255,0,255", 0);
+isPixel(ctx, 75,15, 0,255,0,255, "75,15", "0,255,0,255", 0);
+isPixel(ctx, 75,16, 0,255,0,255, "75,16", "0,255,0,255", 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.lineCap.round.html b/mozilla/content/canvas/test/test_2d.line.lineCap.round.html
new file mode 100644
index 00000000000..9ee85607d09
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.lineCap.round.html
@@ -0,0 +1,84 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.lineCap.round</title>
+<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;
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var tol = 1; // tolerance to avoid antialiasing artifacts
+
+ctx.lineCap = 'round';
+ctx.lineWidth = 20;
+
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+
+ctx.beginPath();
+ctx.moveTo(35-tol, 15);
+ctx.arc(25, 15, 10-tol, 0, Math.PI, true);
+ctx.arc(25, 35, 10-tol, Math.PI, 0, true);
+ctx.fill();
+
+ctx.beginPath();
+ctx.moveTo(25, 15);
+ctx.lineTo(25, 35);
+ctx.stroke();
+
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+
+ctx.beginPath();
+ctx.moveTo(75, 15);
+ctx.lineTo(75, 35);
+ctx.stroke();
+
+ctx.beginPath();
+ctx.moveTo(85+tol, 15);
+ctx.arc(75, 15, 10+tol, 0, Math.PI, true);
+ctx.arc(75, 35, 10+tol, Math.PI, 0, true);
+ctx.fill();
+
+isPixel(ctx, 17,6, 0,255,0,255, "17,6", "0,255,0,255", 0);
+isPixel(ctx, 25,6, 0,255,0,255, "25,6", "0,255,0,255", 0);
+isPixel(ctx, 32,6, 0,255,0,255, "32,6", "0,255,0,255", 0);
+isPixel(ctx, 17,43, 0,255,0,255, "17,43", "0,255,0,255", 0);
+isPixel(ctx, 25,43, 0,255,0,255, "25,43", "0,255,0,255", 0);
+isPixel(ctx, 32,43, 0,255,0,255, "32,43", "0,255,0,255", 0);
+
+isPixel(ctx, 67,6, 0,255,0,255, "67,6", "0,255,0,255", 0);
+isPixel(ctx, 75,6, 0,255,0,255, "75,6", "0,255,0,255", 0);
+isPixel(ctx, 82,6, 0,255,0,255, "82,6", "0,255,0,255", 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.lineCap.square.html b/mozilla/content/canvas/test/test_2d.line.lineCap.square.html
new file mode 100644
index 00000000000..5e006a2eb12
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.lineCap.square.html
@@ -0,0 +1,68 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.lineCap.square</title>
+<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;
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineCap = 'square';
+ctx.lineWidth = 20;
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+ctx.fillRect(15, 5, 20, 40);
+ctx.beginPath();
+ctx.moveTo(25, 15);
+ctx.lineTo(25, 35);
+ctx.stroke();
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(75, 15);
+ctx.lineTo(75, 35);
+ctx.stroke();
+ctx.fillRect(65, 5, 20, 40);
+
+isPixel(ctx, 25,4, 0,255,0,255, "25,4", "0,255,0,255", 0);
+isPixel(ctx, 25,5, 0,255,0,255, "25,5", "0,255,0,255", 0);
+isPixel(ctx, 25,6, 0,255,0,255, "25,6", "0,255,0,255", 0);
+isPixel(ctx, 25,44, 0,255,0,255, "25,44", "0,255,0,255", 0);
+isPixel(ctx, 25,45, 0,255,0,255, "25,45", "0,255,0,255", 0);
+isPixel(ctx, 25,46, 0,255,0,255, "25,46", "0,255,0,255", 0);
+
+isPixel(ctx, 75,4, 0,255,0,255, "75,4", "0,255,0,255", 0);
+isPixel(ctx, 75,5, 0,255,0,255, "75,5", "0,255,0,255", 0);
+isPixel(ctx, 75,6, 0,255,0,255, "75,6", "0,255,0,255", 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.lineJoin.bevel.html b/mozilla/content/canvas/test/test_2d.line.lineJoin.bevel.html
new file mode 100644
index 00000000000..897efa42d9f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.lineJoin.bevel.html
@@ -0,0 +1,87 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.lineJoin.bevel</title>
+<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;
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var tol = 1; // tolerance to avoid antialiasing artifacts
+
+ctx.lineJoin = 'bevel';
+ctx.lineWidth = 20;
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+
+ctx.fillRect(10, 10, 20, 20);
+ctx.fillRect(20, 20, 20, 20);
+ctx.beginPath();
+ctx.moveTo(30, 20);
+ctx.lineTo(40-tol, 20);
+ctx.lineTo(30, 10+tol);
+ctx.fill();
+
+ctx.beginPath();
+ctx.moveTo(10, 20);
+ctx.lineTo(30, 20);
+ctx.lineTo(30, 40);
+ctx.stroke();
+
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+
+ctx.beginPath();
+ctx.moveTo(60, 20);
+ctx.lineTo(80, 20);
+ctx.lineTo(80, 40);
+ctx.stroke();
+
+ctx.fillRect(60, 10, 20, 20);
+ctx.fillRect(70, 20, 20, 20);
+ctx.beginPath();
+ctx.moveTo(80, 20);
+ctx.lineTo(90+tol, 20);
+ctx.lineTo(80, 10-tol);
+ctx.fill();
+
+isPixel(ctx, 34,16, 0,255,0,255, "34,16", "0,255,0,255", 0);
+isPixel(ctx, 34,15, 0,255,0,255, "34,15", "0,255,0,255", 0);
+isPixel(ctx, 35,15, 0,255,0,255, "35,15", "0,255,0,255", 0);
+isPixel(ctx, 36,15, 0,255,0,255, "36,15", "0,255,0,255", 0);
+isPixel(ctx, 36,14, 0,255,0,255, "36,14", "0,255,0,255", 0);
+
+isPixel(ctx, 84,16, 0,255,0,255, "84,16", "0,255,0,255", 0);
+isPixel(ctx, 84,15, 0,255,0,255, "84,15", "0,255,0,255", 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.lineJoin.miter.html b/mozilla/content/canvas/test/test_2d.line.lineJoin.miter.html
new file mode 100644
index 00000000000..0eab8452acd
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.lineJoin.miter.html
@@ -0,0 +1,78 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.lineJoin.miter</title>
+<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;
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineJoin = 'miter';
+ctx.lineWidth = 20;
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+
+ctx.fillRect(10, 10, 30, 20);
+ctx.fillRect(20, 10, 20, 30);
+
+ctx.beginPath();
+ctx.moveTo(10, 20);
+ctx.lineTo(30, 20);
+ctx.lineTo(30, 40);
+ctx.stroke();
+
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+
+ctx.beginPath();
+ctx.moveTo(60, 20);
+ctx.lineTo(80, 20);
+ctx.lineTo(80, 40);
+ctx.stroke();
+
+ctx.fillRect(60, 10, 30, 20);
+ctx.fillRect(70, 10, 20, 30);
+
+isPixel(ctx, 38,12, 0,255,0,255, "38,12", "0,255,0,255", 0);
+isPixel(ctx, 39,11, 0,255,0,255, "39,11", "0,255,0,255", 0);
+isPixel(ctx, 40,10, 0,255,0,255, "40,10", "0,255,0,255", 0);
+isPixel(ctx, 41,9, 0,255,0,255, "41,9", "0,255,0,255", 0);
+isPixel(ctx, 42,8, 0,255,0,255, "42,8", "0,255,0,255", 0);
+
+isPixel(ctx, 88,12, 0,255,0,255, "88,12", "0,255,0,255", 0);
+isPixel(ctx, 89,11, 0,255,0,255, "89,11", "0,255,0,255", 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.lineJoin.round.html b/mozilla/content/canvas/test/test_2d.line.lineJoin.round.html
new file mode 100644
index 00000000000..9f46dccf42d
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.lineJoin.round.html
@@ -0,0 +1,85 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.lineJoin.round</title>
+<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;
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var tol = 1; // tolerance to avoid antialiasing artifacts
+
+ctx.lineJoin = 'round';
+ctx.lineWidth = 20;
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+
+ctx.fillRect(10, 10, 20, 20);
+ctx.fillRect(20, 20, 20, 20);
+ctx.beginPath();
+ctx.moveTo(30, 20);
+ctx.arc(30, 20, 10-tol, 0, 2*Math.PI, true);
+ctx.fill();
+
+ctx.beginPath();
+ctx.moveTo(10, 20);
+ctx.lineTo(30, 20);
+ctx.lineTo(30, 40);
+ctx.stroke();
+
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+
+ctx.beginPath();
+ctx.moveTo(60, 20);
+ctx.lineTo(80, 20);
+ctx.lineTo(80, 40);
+ctx.stroke();
+
+ctx.fillRect(60, 10, 20, 20);
+ctx.fillRect(70, 20, 20, 20);
+ctx.beginPath();
+ctx.moveTo(80, 20);
+ctx.arc(80, 20, 10+tol, 0, 2*Math.PI, true);
+ctx.fill();
+
+isPixel(ctx, 36,14, 0,255,0,255, "36,14", "0,255,0,255", 0);
+isPixel(ctx, 36,13, 0,255,0,255, "36,13", "0,255,0,255", 0);
+isPixel(ctx, 37,13, 0,255,0,255, "37,13", "0,255,0,255", 0);
+isPixel(ctx, 38,13, 0,255,0,255, "38,13", "0,255,0,255", 0);
+isPixel(ctx, 38,12, 0,255,0,255, "38,12", "0,255,0,255", 0);
+
+isPixel(ctx, 86,14, 0,255,0,255, "86,14", "0,255,0,255", 0);
+isPixel(ctx, 86,13, 0,255,0,255, "86,13", "0,255,0,255", 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.lineWidth.basic.html b/mozilla/content/canvas/test/test_2d.line.lineWidth.basic.html
new file mode 100644
index 00000000000..937855e0505
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.lineWidth.basic.html
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.lineWidth.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 20;
+// Draw a green line over a red box, to check the line is not too small
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+ctx.fillRect(15, 15, 20, 20);
+ctx.beginPath();
+ctx.moveTo(25, 15);
+ctx.lineTo(25, 35);
+ctx.stroke();
+
+// Draw a green box over a red line, to check the line is not too large
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(75, 15);
+ctx.lineTo(75, 35);
+ctx.stroke();
+ctx.fillRect(65, 15, 20, 20);
+
+isPixel(ctx, 14,25, 0,255,0,255, "14,25", "0,255,0,255", 0);
+isPixel(ctx, 15,25, 0,255,0,255, "15,25", "0,255,0,255", 0);
+isPixel(ctx, 16,25, 0,255,0,255, "16,25", "0,255,0,255", 0);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 34,25, 0,255,0,255, "34,25", "0,255,0,255", 0);
+isPixel(ctx, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 0);
+isPixel(ctx, 36,25, 0,255,0,255, "36,25", "0,255,0,255", 0);
+
+isPixel(ctx, 64,25, 0,255,0,255, "64,25", "0,255,0,255", 0);
+isPixel(ctx, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 0);
+isPixel(ctx, 66,25, 0,255,0,255, "66,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.lineWidth.transformed.html b/mozilla/content/canvas/test/test_2d.line.lineWidth.transformed.html
new file mode 100644
index 00000000000..0429dbf1540
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.lineWidth.transformed.html
@@ -0,0 +1,76 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.lineWidth.transformed</title>
+<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;
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 4;
+// Draw a green line over a red box, to check the line is not too small
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+ctx.fillRect(15, 15, 20, 20);
+ctx.save();
+ ctx.scale(5, 1);
+ ctx.beginPath();
+ ctx.moveTo(5, 15);
+ ctx.lineTo(5, 35);
+ ctx.stroke();
+ctx.restore();
+
+// Draw a green box over a red line, to check the line is not too large
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.save();
+ ctx.scale(-5, 1);
+ ctx.beginPath();
+ ctx.moveTo(-15, 15);
+ ctx.lineTo(-15, 35);
+ ctx.stroke();
+ctx.restore();
+ctx.fillRect(65, 15, 20, 20);
+
+isPixel(ctx, 14,25, 0,255,0,255, "14,25", "0,255,0,255", 0);
+isPixel(ctx, 15,25, 0,255,0,255, "15,25", "0,255,0,255", 0);
+isPixel(ctx, 16,25, 0,255,0,255, "16,25", "0,255,0,255", 0);
+isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
+isPixel(ctx, 34,25, 0,255,0,255, "34,25", "0,255,0,255", 0);
+isPixel(ctx, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 0);
+isPixel(ctx, 36,25, 0,255,0,255, "36,25", "0,255,0,255", 0);
+
+isPixel(ctx, 64,25, 0,255,0,255, "64,25", "0,255,0,255", 0);
+isPixel(ctx, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 0);
+isPixel(ctx, 66,25, 0,255,0,255, "66,25", "0,255,0,255", 0);
+isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.miter.exceeded.html b/mozilla/content/canvas/test/test_2d.line.miter.exceeded.html
new file mode 100644
index 00000000000..35c2c708a1d
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.miter.exceeded.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.miter.exceeded</title>
+<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;
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 400;
+ctx.lineJoin = 'miter';
+
+ctx.strokeStyle = '#f00';
+ctx.miterLimit = 1.414;
+ctx.beginPath();
+ctx.moveTo(200, 1000);
+ctx.lineTo(200, 200);
+ctx.lineTo(1000, 201);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.miter.lineedge.html b/mozilla/content/canvas/test/test_2d.line.miter.lineedge.html
new file mode 100644
index 00000000000..6197ded74b6
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.miter.lineedge.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.miter.lineedge</title>
+<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;
+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');
+
+// In Safari/FF3, this works if you do something like ctx.rotate(0.001);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 200;
+ctx.lineJoin = 'miter';
+
+ctx.strokeStyle = '#f00';
+ctx.miterLimit = 1.414;
+ctx.beginPath();
+ctx.strokeRect(100, 25, 200, 0);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.miter.rightangle.html b/mozilla/content/canvas/test/test_2d.line.miter.rightangle.html
new file mode 100644
index 00000000000..e3e3c5a4a71
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.miter.rightangle.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.miter.rightangle</title>
+<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;
+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');
+
+// In FF3, this works if you do something like ctx.rotate(0.001);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 400;
+ctx.lineJoin = 'miter';
+
+ctx.strokeStyle = '#f00';
+ctx.miterLimit = 1.414;
+ctx.beginPath();
+ctx.moveTo(200, 1000);
+ctx.lineTo(200, 200);
+ctx.lineTo(1000, 200);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.miter.within.html b/mozilla/content/canvas/test/test_2d.line.miter.within.html
new file mode 100644
index 00000000000..691f09d51a5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.miter.within.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.line.miter.within</title>
+<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;
+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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 400;
+ctx.lineJoin = 'miter';
+
+ctx.strokeStyle = '#0f0';
+ctx.miterLimit = 1.416;
+ctx.beginPath();
+ctx.moveTo(200, 1000);
+ctx.lineTo(200, 200);
+ctx.lineTo(1000, 201);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.line.union.html b/mozilla/content/canvas/test/test_2d.line.union.html
new file mode 100644
index 00000000000..976765be1f3
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.line.union.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 100;
+ctx.lineCap = 'round';
+
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 24);
+ctx.lineTo(100, 25);
+ctx.lineTo(0, 26);
+ctx.closePath();
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
+isPixel(ctx, 25,1, 0,255,0,255, "25,1", "0,255,0,255", 0);
+isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.angle.1.html b/mozilla/content/canvas/test/test_2d.path.arc.angle.1.html
new file mode 100644
index 00000000000..367b20faef7
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.angle.1.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.angle.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.angle.2.html b/mozilla/content/canvas/test/test_2d.path.arc.angle.2.html
new file mode 100644
index 00000000000..79af1eed498
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.angle.2.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.angle.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.angle.3.html b/mozilla/content/canvas/test/test_2d.path.arc.angle.3.html
new file mode 100644
index 00000000000..1d7573f3b22
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.angle.3.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.angle.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.angle.4.html b/mozilla/content/canvas/test/test_2d.path.arc.angle.4.html
new file mode 100644
index 00000000000..5dd0f61a433
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.angle.4.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.angle.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.beginPath();
+ctx.moveTo(100, 0);
+ctx.arc(100, 0, 150, (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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.empty.html b/mozilla/content/canvas/test/test_2d.path.arc.empty.html
new file mode 100644
index 00000000000..424bb981f0d
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.empty.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.end.html b/mozilla/content/canvas/test/test_2d.path.arc.end.html
new file mode 100644
index 00000000000..524242551cf
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.end.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.end</title>
+<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" 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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.lineWidth = 50;
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(-100, 0);
+ctx.arc(-100, 0, 25, -Math.PI/2, Math.PI/2, true);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.negative.html b/mozilla/content/canvas/test/test_2d.path.arc.negative.html
new file mode 100644
index 00000000000..2f67793cce5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.negative.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.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">
+<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.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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.nonempty.html b/mozilla/content/canvas/test/test_2d.path.arc.nonempty.html
new file mode 100644
index 00000000000..18c57316299
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.nonempty.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.nonempty</title>
+<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" 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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.lineWidth = 50;
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.selfintersect.1.html b/mozilla/content/canvas/test/test_2d.path.arc.selfintersect.1.html
new file mode 100644
index 00000000000..c5c61badeb4
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.selfintersect.1.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.selfintersect.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.lineWidth = 200;
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.arc(100, 50, 25, 0, -Math.PI/2, true);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.selfintersect.2.html b/mozilla/content/canvas/test/test_2d.path.arc.selfintersect.2.html
new file mode 100644
index 00000000000..04a8df9d2cf
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.selfintersect.2.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.selfintersect.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.lineWidth = 180;
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.arc(-50, 50, 25, 0, -Math.PI/2, true);
+ctx.stroke();
+ctx.beginPath();
+ctx.arc(100, 0, 25, 0, -Math.PI/2, true);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+isPixel(ctx, 90,10, 0,255,0,255, "90,10", "0,255,0,255", 0);
+isPixel(ctx, 97,1, 0,255,0,255, "97,1", "0,255,0,255", 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.shape.1.html b/mozilla/content/canvas/test/test_2d.path.arc.shape.1.html
new file mode 100644
index 00000000000..5696e287152
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.shape.1.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.shape.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.shape.2.html b/mozilla/content/canvas/test/test_2d.path.arc.shape.2.html
new file mode 100644
index 00000000000..c29da5814ae
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.shape.2.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.shape.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.lineWidth = 100;
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.arc(50, 50, 50, 0, Math.PI, 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, 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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.shape.3.html b/mozilla/content/canvas/test/test_2d.path.arc.shape.3.html
new file mode 100644
index 00000000000..6c10ff93ef9
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.shape.3.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.shape.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.shape.4.html b/mozilla/content/canvas/test/test_2d.path.arc.shape.4.html
new file mode 100644
index 00000000000..0758de7b947
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.shape.4.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.shape.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.shape.5.html b/mozilla/content/canvas/test/test_2d.path.arc.shape.5.html
new file mode 100644
index 00000000000..ca6733a4ca4
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.shape.5.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.shape.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.zero.1.html b/mozilla/content/canvas/test/test_2d.path.arc.zero.1.html
new file mode 100644
index 00000000000..540b5ff5b9f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.zero.1.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.zero.2.html b/mozilla/content/canvas/test/test_2d.path.arc.zero.2.html
new file mode 100644
index 00000000000..19e5c0b6393
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.zero.2.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.zero.3.html b/mozilla/content/canvas/test/test_2d.path.arc.zero.3.html
new file mode 100644
index 00000000000..990df924c01
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.zero.3.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.zero.4.html b/mozilla/content/canvas/test/test_2d.path.arc.zero.4.html
new file mode 100644
index 00000000000..9703c9060af
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.zero.4.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 100;
+ctx.beginPath();
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.zero.5.html b/mozilla/content/canvas/test/test_2d.path.arc.zero.5.html
new file mode 100644
index 00000000000..d0400826447
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.zero.5.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 100;
+ctx.beginPath();
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.zero.6.html b/mozilla/content/canvas/test/test_2d.path.arc.zero.6.html
new file mode 100644
index 00000000000..f2a21b3bb80
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.zero.6.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 100;
+ctx.beginPath();
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.arc.zero.html b/mozilla/content/canvas/test/test_2d.path.arc.zero.html
new file mode 100644
index 00000000000..ee21f118c89
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.arc.zero.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.arc.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">
+<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.arc(0, 0, 0, 0, 0, true);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.beginPath.html b/mozilla/content/canvas/test/test_2d.path.beginPath.html
new file mode 100644
index 00000000000..f922595893e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.beginPath.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.rect(0, 0, 100, 50);
+ctx.beginPath();
+ctx.fillStyle = '#f00';
+ctx.fill();
+isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.bezierCurveTo.basic.html b/mozilla/content/canvas/test/test_2d.path.bezierCurveTo.basic.html
new file mode 100644
index 00000000000..0db66fdb6e7
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.bezierCurveTo.basic.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.moveTo(0, 25);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.bezierCurveTo.emptysubpath.html b/mozilla/content/canvas/test/test_2d.path.bezierCurveTo.emptysubpath.html
new file mode 100644
index 00000000000..a40352daaec
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.bezierCurveTo.emptysubpath.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.bezierCurveTo(0, 25, 0, 25, 0, 25);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.bezierCurveTo.scaled.html b/mozilla/content/canvas/test/test_2d.path.bezierCurveTo.scaled.html
new file mode 100644
index 00000000000..ebf090ba158
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.bezierCurveTo.scaled.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.scale(1000, 1000);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 0.055;
+ctx.beginPath();
+ctx.moveTo(-2, 3.1);
+ctx.bezierCurveTo(-2, -1, 2.1, -1, 2.1, 3.1);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.bezierCurveTo.shape.html b/mozilla/content/canvas/test/test_2d.path.bezierCurveTo.shape.html
new file mode 100644
index 00000000000..119e6240eae
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.bezierCurveTo.shape.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 55;
+ctx.beginPath();
+ctx.moveTo(-2000, 3100);
+ctx.bezierCurveTo(-2000, -1000, 2100, -1000, 2100, 3100);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.clip.basic.1.html b/mozilla/content/canvas/test/test_2d.path.clip.basic.1.html
new file mode 100644
index 00000000000..2276bd53f00
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.clip.basic.1.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(0, 0, 100, 50);
+ctx.clip();
+
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.clip.basic.2.html b/mozilla/content/canvas/test/test_2d.path.clip.basic.2.html
new file mode 100644
index 00000000000..48950cd6883
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.clip.basic.2.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(-100, 0, 100, 50);
+ctx.clip();
+
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.clip.empty.html b/mozilla/content/canvas/test/test_2d.path.clip.empty.html
new file mode 100644
index 00000000000..c07d98ac220
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.clip.empty.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.clip();
+
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.clip.intersect.html b/mozilla/content/canvas/test/test_2d.path.clip.intersect.html
new file mode 100644
index 00000000000..1cfd4b3deab
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.clip.intersect.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(0, 0, 50, 50);
+ctx.clip();
+ctx.beginPath();
+ctx.rect(50, 0, 50, 50)
+ctx.clip();
+
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.clip.unaffected.html b/mozilla/content/canvas/test/test_2d.path.clip.unaffected.html
new file mode 100644
index 00000000000..fe6f2d3ab37
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.clip.unaffected.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+
+ctx.beginPath();
+ctx.lineTo(0, 0);
+ctx.lineTo(0, 50);
+ctx.lineTo(100, 50);
+ctx.lineTo(100, 0);
+ctx.clip();
+
+ctx.lineTo(0, 0);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.clip.winding.1.html b/mozilla/content/canvas/test/test_2d.path.clip.winding.1.html
new file mode 100644
index 00000000000..2a216190517
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.clip.winding.1.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.moveTo(-10, -10);
+ctx.lineTo(110, -10);
+ctx.lineTo(110, 60);
+ctx.lineTo(-10, 60);
+ctx.lineTo(-10, -10);
+ctx.lineTo(0, 0);
+ctx.lineTo(0, 50);
+ctx.lineTo(100, 50);
+ctx.lineTo(100, 0);
+ctx.clip();
+
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.clip.winding.2.html b/mozilla/content/canvas/test/test_2d.path.clip.winding.2.html
new file mode 100644
index 00000000000..42a4c07702b
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.clip.winding.2.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.moveTo(-10, -10);
+ctx.lineTo(110, -10);
+ctx.lineTo(110, 60);
+ctx.lineTo(-10, 60);
+ctx.lineTo(-10, -10);
+ctx.clip();
+
+ctx.beginPath();
+ctx.lineTo(0, 0);
+ctx.lineTo(0, 50);
+ctx.lineTo(100, 50);
+ctx.lineTo(100, 0);
+ctx.lineTo(0, 0);
+ctx.clip();
+
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.closePath.empty.html b/mozilla/content/canvas/test/test_2d.path.closePath.empty.html
new file mode 100644
index 00000000000..58ffafea712
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.closePath.empty.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.closePath();
+ctx.fillStyle = '#f00';
+ctx.fill();
+isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.closePath.newline.html b/mozilla/content/canvas/test/test_2d.path.closePath.newline.html
new file mode 100644
index 00000000000..c4db6810524
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.closePath.newline.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.moveTo(-100, 25);
+ctx.lineTo(-100, -100);
+ctx.lineTo(200, -100);
+ctx.lineTo(200, 25);
+ctx.closePath();
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.closePath.nextpoint.html b/mozilla/content/canvas/test/test_2d.path.closePath.nextpoint.html
new file mode 100644
index 00000000000..f52415cb1c8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.closePath.nextpoint.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.moveTo(-100, 25);
+ctx.lineTo(-100, -1000);
+ctx.closePath();
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.fill.closed.basic.html b/mozilla/content/canvas/test/test_2d.path.fill.closed.basic.html
new file mode 100644
index 00000000000..cb7e78ae121
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.fill.closed.basic.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.fill.closed.unaffected.html b/mozilla/content/canvas/test/test_2d.path.fill.closed.unaffected.html
new file mode 100644
index 00000000000..0e1ae171fa5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.fill.closed.unaffected.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#00f';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.lineTo(100, 50);
+ctx.fillStyle = '#f00';
+ctx.fill();
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.fill.winding.add.html b/mozilla/content/canvas/test/test_2d.path.fill.winding.add.html
new file mode 100644
index 00000000000..9b34a99cc50
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.fill.winding.add.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.moveTo(-10, -10);
+ctx.lineTo(110, -10);
+ctx.lineTo(110, 60);
+ctx.lineTo(-10, 60);
+ctx.lineTo(-10, -10);
+ctx.lineTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.fill.winding.subtract.1.html b/mozilla/content/canvas/test/test_2d.path.fill.winding.subtract.1.html
new file mode 100644
index 00000000000..0b0124274d2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.fill.winding.subtract.1.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.moveTo(-10, -10);
+ctx.lineTo(110, -10);
+ctx.lineTo(110, 60);
+ctx.lineTo(-10, 60);
+ctx.lineTo(-10, -10);
+ctx.lineTo(0, 0);
+ctx.lineTo(0, 50);
+ctx.lineTo(100, 50);
+ctx.lineTo(100, 0);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.fill.winding.subtract.2.html b/mozilla/content/canvas/test/test_2d.path.fill.winding.subtract.2.html
new file mode 100644
index 00000000000..af4dd6d3dd3
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.fill.winding.subtract.2.html
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.moveTo(-10, -10);
+ctx.lineTo(110, -10);
+ctx.lineTo(110, 60);
+ctx.lineTo(-10, 60);
+ctx.moveTo(0, 0);
+ctx.lineTo(0, 50);
+ctx.lineTo(100, 50);
+ctx.lineTo(100, 0);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.fill.winding.subtract.3.html b/mozilla/content/canvas/test/test_2d.path.fill.winding.subtract.3.html
new file mode 100644
index 00000000000..6774705c916
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.fill.winding.subtract.3.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.moveTo(-10, -10);
+ctx.lineTo(110, -10);
+ctx.lineTo(110, 60);
+ctx.lineTo(-10, 60);
+ctx.lineTo(-10, -10);
+ctx.lineTo(-20, -20);
+ctx.lineTo(120, -20);
+ctx.lineTo(120, 70);
+ctx.lineTo(-20, 70);
+ctx.lineTo(-20, -20);
+ctx.lineTo(0, 0);
+ctx.lineTo(0, 50);
+ctx.lineTo(100, 50);
+ctx.lineTo(100, 0);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.initial.html b/mozilla/content/canvas/test/test_2d.path.initial.html
new file mode 100644
index 00000000000..e1d08afd12c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.initial.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.lineTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.closePath();
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.isPointInPath.basic.1.html b/mozilla/content/canvas/test/test_2d.path.isPointInPath.basic.1.html
new file mode 100644
index 00000000000..9e13ace95a0
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.isPointInPath.basic.1.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.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">
+<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.rect(0, 0, 20, 20);
+ok(ctx.isPointInPath(10, 10) === true, "ctx.isPointInPath(10, 10) === true");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.isPointInPath.basic.2.html b/mozilla/content/canvas/test/test_2d.path.isPointInPath.basic.2.html
new file mode 100644
index 00000000000..69d941541f3
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.isPointInPath.basic.2.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.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">
+<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.rect(20, 0, 20, 20);
+ok(ctx.isPointInPath(10, 10) === false, "ctx.isPointInPath(10, 10) === false");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.isPointInPath.empty.html b/mozilla/content/canvas/test/test_2d.path.isPointInPath.empty.html
new file mode 100644
index 00000000000..5a0388fdeb0
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.isPointInPath.empty.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.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">
+<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');
+
+ok(ctx.isPointInPath(0, 0) === false, "ctx.isPointInPath(0, 0) === false");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.isPointInPath.transform.1.html b/mozilla/content/canvas/test/test_2d.path.isPointInPath.transform.1.html
new file mode 100644
index 00000000000..192e7f8635a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.isPointInPath.transform.1.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.transform.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">
+<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.translate(50, 0);
+ctx.rect(0, 0, 20, 20);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.isPointInPath.transform.2.html b/mozilla/content/canvas/test/test_2d.path.isPointInPath.transform.2.html
new file mode 100644
index 00000000000..f586cc48148
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.isPointInPath.transform.2.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.transform.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">
+<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.rect(0, 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(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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.isPointInPath.transform.3.html b/mozilla/content/canvas/test/test_2d.path.isPointInPath.transform.3.html
new file mode 100644
index 00000000000..a18864d464e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.isPointInPath.transform.3.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.transform.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">
+<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.scale(-1, 1);
+ctx.rect(-70, 0, 20, 20);
+ok(ctx.isPointInPath(-40, 10) === false, "ctx.isPointInPath(-40, 10) === false");
+ok(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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.isPointInPath.unclosed.html b/mozilla/content/canvas/test/test_2d.path.isPointInPath.unclosed.html
new file mode 100644
index 00000000000..0228863d89f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.isPointInPath.unclosed.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.unclosed</title>
+<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.moveTo(0, 0);
+ctx.lineTo(20, 0);
+ctx.lineTo(20, 20);
+ctx.lineTo(0, 20);
+ok(ctx.isPointInPath(10, 10) === true, "ctx.isPointInPath(10, 10) === true");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.isPointInPath.winding.html b/mozilla/content/canvas/test/test_2d.path.isPointInPath.winding.html
new file mode 100644
index 00000000000..7bb3cfc5bc6
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.isPointInPath.winding.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.isPointInPath.winding</title>
+<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.moveTo(0, 0);
+ctx.lineTo(50, 0);
+ctx.lineTo(50, 50);
+ctx.lineTo(0, 50);
+ctx.lineTo(0, 0);
+ctx.lineTo(10, 10);
+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");
+ok(ctx.isPointInPath(5, 25) === true, "ctx.isPointInPath(5, 25) === true");
+ok(ctx.isPointInPath(25, 25) === false, "ctx.isPointInPath(25, 25) === false");
+ok(ctx.isPointInPath(45, 25) === true, "ctx.isPointInPath(45, 25) === true");
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.lineTo.basic.html b/mozilla/content/canvas/test/test_2d.path.lineTo.basic.html
new file mode 100644
index 00000000000..fa729416a41
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.lineTo.basic.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.moveTo(0, 25);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.lineTo.emptysubpath.html b/mozilla/content/canvas/test/test_2d.path.lineTo.emptysubpath.html
new file mode 100644
index 00000000000..edde758bc38
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.lineTo.emptysubpath.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.lineTo(0, 25);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.lineTo.nextpoint.html b/mozilla/content/canvas/test/test_2d.path.lineTo.nextpoint.html
new file mode 100644
index 00000000000..170b661e255
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.lineTo.nextpoint.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.moveTo(-100, -100);
+ctx.lineTo(0, 25);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.moveTo.basic.html b/mozilla/content/canvas/test/test_2d.path.moveTo.basic.html
new file mode 100644
index 00000000000..ed55dc5c7e5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.moveTo.basic.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.rect(0, 0, 10, 50);
+ctx.moveTo(100, 0);
+ctx.lineTo(10, 0);
+ctx.lineTo(10, 50);
+ctx.lineTo(100, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 90,25, 0,255,0,255, "90,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.moveTo.multiple.html b/mozilla/content/canvas/test/test_2d.path.moveTo.multiple.html
new file mode 100644
index 00000000000..0635138ac5a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.moveTo.multiple.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.moveTo(0, 25);
+ctx.moveTo(100, 25);
+ctx.moveTo(0, 25);
+ctx.lineTo(100, 25);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.moveTo.newsubpath.html b/mozilla/content/canvas/test/test_2d.path.moveTo.newsubpath.html
new file mode 100644
index 00000000000..0e9cf86e0e8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.moveTo.newsubpath.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.beginPath();
+ctx.moveTo(0, 0);
+ctx.moveTo(100, 0);
+ctx.moveTo(100, 50);
+ctx.moveTo(0, 50);
+ctx.fillStyle = '#f00';
+ctx.fill();
+isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.basic.html b/mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.basic.html
new file mode 100644
index 00000000000..bb46f7840b1
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.basic.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.moveTo(0, 25);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.emptysubpath.html b/mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.emptysubpath.html
new file mode 100644
index 00000000000..93abadda4fa
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.emptysubpath.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.quadraticCurveTo(0, 25, 0, 25);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.scaled.html b/mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.scaled.html
new file mode 100644
index 00000000000..2731a0bde0f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.scaled.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.scale(1000, 1000);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 0.055;
+ctx.beginPath();
+ctx.moveTo(-1, 1.05);
+ctx.quadraticCurveTo(0, -1, 1.2, 1.05);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.shape.html b/mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.shape.html
new file mode 100644
index 00000000000..8aee724facc
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.quadraticCurveTo.shape.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 55;
+ctx.beginPath();
+ctx.moveTo(-1000, 1050);
+ctx.quadraticCurveTo(0, -1000, 1200, 1050);
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.rect.basic.html b/mozilla/content/canvas/test/test_2d.path.rect.basic.html
new file mode 100644
index 00000000000..1c072a79246
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.rect.basic.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.rect.closed.html b/mozilla/content/canvas/test/test_2d.path.rect.closed.html
new file mode 100644
index 00000000000..5ab80207607
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.rect.closed.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 200;
+ctx.lineJoin = 'miter';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.rect.end.1.html b/mozilla/content/canvas/test/test_2d.path.rect.end.1.html
new file mode 100644
index 00000000000..ebd372d6ea7
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.rect.end.1.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 100;
+ctx.rect(200, 100, 400, 1000);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.rect.end.2.html b/mozilla/content/canvas/test/test_2d.path.rect.end.2.html
new file mode 100644
index 00000000000..282db941793
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.rect.end.2.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 450;
+ctx.lineCap = 'round';
+ctx.lineJoin = 'bevel';
+ctx.rect(150, 150, 2000, 2000);
+ctx.lineTo(160, 160);
+ctx.stroke();
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.rect.negative.html b/mozilla/content/canvas/test/test_2d.path.rect.negative.html
new file mode 100644
index 00000000000..14537e2d6df
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.rect.negative.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML>
+<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">
+<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.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");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.rect.newsubpath.html b/mozilla/content/canvas/test/test_2d.path.rect.newsubpath.html
new file mode 100644
index 00000000000..ea34382feb2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.rect.newsubpath.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.beginPath();
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.moveTo(-100, 25);
+ctx.lineTo(-50, 25);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.rect.selfintersect.html b/mozilla/content/canvas/test/test_2d.path.rect.selfintersect.html
new file mode 100644
index 00000000000..3e2290da500
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.rect.selfintersect.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 90;
+ctx.beginPath();
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.rect.zero.1.html b/mozilla/content/canvas/test/test_2d.path.rect.zero.1.html
new file mode 100644
index 00000000000..7f70648fcd8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.rect.zero.1.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 100;
+ctx.beginPath();
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.rect.zero.2.html b/mozilla/content/canvas/test/test_2d.path.rect.zero.2.html
new file mode 100644
index 00000000000..9f33e2cecb2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.rect.zero.2.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 100;
+ctx.beginPath();
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.rect.zero.3.html b/mozilla/content/canvas/test/test_2d.path.rect.zero.3.html
new file mode 100644
index 00000000000..61b46fb9e44
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.rect.zero.3.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.beginPath();
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.rect.zero.4.html b/mozilla/content/canvas/test/test_2d.path.rect.zero.4.html
new file mode 100644
index 00000000000..07d523c3c8c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.rect.zero.4.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.rect(100, 25, 0, 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.rect.zero.5.html b/mozilla/content/canvas/test/test_2d.path.rect.zero.5.html
new file mode 100644
index 00000000000..9f94b3dee2e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.rect.zero.5.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.moveTo(0, 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.rect.zero.6.html b/mozilla/content/canvas/test/test_2d.path.rect.zero.6.html
new file mode 100644
index 00000000000..beefc06b529
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.rect.zero.6.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#f00';
+ctx.lineJoin = 'miter';
+ctx.miterLimit = 1.5;
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.stroke.unaffected.html b/mozilla/content/canvas/test/test_2d.path.stroke.unaffected.html
new file mode 100644
index 00000000000..957b64d46de
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.stroke.unaffected.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.stroke.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 50;
+ctx.moveTo(-100, 25);
+ctx.lineTo(-100, -100);
+ctx.lineTo(200, -100);
+ctx.lineTo(200, 25);
+ctx.strokeStyle = '#f00';
+ctx.stroke();
+
+ctx.closePath();
+ctx.strokeStyle = '#0f0';
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.stroke.union.html b/mozilla/content/canvas/test/test_2d.path.stroke.union.html
new file mode 100644
index 00000000000..97962da9276
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.stroke.union.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.stroke.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 40;
+ctx.moveTo(0, 10);
+ctx.lineTo(100, 10);
+ctx.moveTo(100, 40);
+ctx.lineTo(0, 40);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.transformation.basic.html b/mozilla/content/canvas/test/test_2d.path.transformation.basic.html
new file mode 100644
index 00000000000..f475dcb556d
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.transformation.basic.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+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.translate(-100, 0);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.transformation.multiple.1.html b/mozilla/content/canvas/test/test_2d.path.transformation.multiple.1.html
new file mode 100644
index 00000000000..bf6b5aa6bde
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.transformation.multiple.1.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.transformation.multiple.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+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.fill();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.transformation.multiple.2.html b/mozilla/content/canvas/test/test_2d.path.transformation.multiple.2.html
new file mode 100644
index 00000000000..0584ee8efc3
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.transformation.multiple.2.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.transformation.multiple.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+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.fill();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.path.transformation.multiple.3.html b/mozilla/content/canvas/test/test_2d.path.transformation.multiple.3.html
new file mode 100644
index 00000000000..17a5b368580
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.path.transformation.multiple.3.html
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.path.transformation.multiple.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+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();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.basic.canvas.html b/mozilla/content/canvas/test/test_2d.pattern.basic.canvas.html
new file mode 100644
index 00000000000..35d7313cecc
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.basic.canvas.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#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 = '#0f0';
+ctx2.fillRect(0, 0, 100, 50);
+
+var pattern = ctx.createPattern(canvas2, 'no-repeat');
+ctx.fillStyle = pattern;
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.basic.image.html b/mozilla/content/canvas/test/test_2d.pattern.basic.image.html
new file mode 100644
index 00000000000..71e370b71dd
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.basic.image.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+var img = document.getElementById('green.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.basic.nocontext.html b/mozilla/content/canvas/test/test_2d.pattern.basic.nocontext.html
new file mode 100644
index 00000000000..f779b53883f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.basic.nocontext.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var pattern = ctx.createPattern(canvas2, 'no-repeat');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.basic.type.html b/mozilla/content/canvas/test/test_2d.pattern.basic.type.html
new file mode 100644
index 00000000000..e928a09af2e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.basic.type.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<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">
+<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 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]'");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.crosscanvas.html b/mozilla/content/canvas/test/test_2d.pattern.crosscanvas.html
new file mode 100644
index 00000000000..ab22fbf577e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.crosscanvas.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+var img = document.getElementById('green.png');
+
+var pattern = document.createElement('canvas').getContext('2d').createPattern(img, 'no-repeat');
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = pattern;
+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();
+});
+</script>
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.image.broken.html b/mozilla/content/canvas/test/test_2d.pattern.image.broken.html
new file mode 100644
index 00000000000..842e64e5232
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.image.broken.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<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">
+<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 img = document.getElementById('broken.png');
+todo(img.complete === false, "img.complete === false");
+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();
+});
+</script>
+<img src="image_broken.png" id="broken.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.image.incomplete.html b/mozilla/content/canvas/test/test_2d.pattern.image.incomplete.html
new file mode 100644
index 00000000000..5d2b6fddde7
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.image.incomplete.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<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">
+<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 img = new Image();
+todo(img.complete === false, "img.complete === false");
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.image.null.html b/mozilla/content/canvas/test/test_2d.pattern.image.null.html
new file mode 100644
index 00000000000..eadc2f73a90
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.image.null.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<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">
+<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.createPattern(null, 'repeat');
+} 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/mozilla/content/canvas/test/test_2d.pattern.image.string.html b/mozilla/content/canvas/test/test_2d.pattern.image.string.html
new file mode 100644
index 00000000000..dd74225d1c5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.image.string.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<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">
+<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.createPattern('image_green.png', 'repeat');
+} 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/mozilla/content/canvas/test/test_2d.pattern.image.undefined.html b/mozilla/content/canvas/test/test_2d.pattern.image.undefined.html
new file mode 100644
index 00000000000..7ad95e2bf63
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.image.undefined.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<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">
+<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.createPattern(undefined, 'repeat');
+} 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/mozilla/content/canvas/test/test_2d.pattern.modify.canvas1.html b/mozilla/content/canvas/test/test_2d.pattern.modify.canvas1.html
new file mode 100644
index 00000000000..fa379ba1911
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.modify.canvas1.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+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);
+
+var pattern = ctx.createPattern(canvas2, 'no-repeat');
+
+ctx2.fillStyle = '#f00';
+ctx2.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.modify.canvas2.html b/mozilla/content/canvas/test/test_2d.pattern.modify.canvas2.html
new file mode 100644
index 00000000000..1000ba21174
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.modify.canvas2.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+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);
+
+var pattern = ctx.createPattern(canvas2, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx2.fillStyle = '#f00';
+ctx2.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.modify.image1.html b/mozilla/content/canvas/test/test_2d.pattern.modify.image1.html
new file mode 100644
index 00000000000..2ed789fa116
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.modify.image1.html
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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');
+
+var img = document.getElementById('green.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+deferTest();
+img.onload = wrapFunction(function ()
+{
+    ctx.fillStyle = pattern;
+    ctx.fillRect(0, 0, 100, 50);
+
+    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);
+});
+img.src = 'image_red.png';
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.modify.image2.html b/mozilla/content/canvas/test/test_2d.pattern.modify.image2.html
new file mode 100644
index 00000000000..3d3c20d73e8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.modify.image2.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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');
+
+var img = document.getElementById('green.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#00f';
+ctx.fillRect(0, 0, 100, 50);
+deferTest();
+img.onload = wrapFunction(function ()
+{
+    ctx.fillStyle = pattern;
+    ctx.fillRect(0, 0, 100, 50);
+
+    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);
+});
+img.src = 'image_red.png';
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.coord3.html b/mozilla/content/canvas/test/test_2d.pattern.paint.coord3.html
new file mode 100644
index 00000000000..b8680d484e1
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.coord3.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.pattern.paint.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.translate(50, 25);
+ctx.fillRect(-50, -25, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.basic.html b/mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.basic.html
new file mode 100644
index 00000000000..7a316feb41c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.basic.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('green.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.coord1.html b/mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.coord1.html
new file mode 100644
index 00000000000..cf326b1848b
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.coord1.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(50, 0, 50, 50);
+
+var img = document.getElementById('green.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.translate(50, 0);
+ctx.fillRect(-50, 0, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.coord2.html b/mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.coord2.html
new file mode 100644
index 00000000000..b054fd7b018
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.coord2.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+var img = document.getElementById('green.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 50, 50);
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(50, 0, 50, 50);
+
+ctx.fillStyle = pattern;
+ctx.translate(50, 0);
+ctx.fillRect(-50, 0, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green.png" id="green.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.outside.html b/mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.outside.html
new file mode 100644
index 00000000000..d579b33b00e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.norepeat.outside.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = pattern;
+ctx.fillRect(0, -50, 100, 50);
+ctx.fillRect(-100, 0, 100, 50);
+ctx.fillRect(0, 50, 100, 50);
+ctx.fillRect(100, 0, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_red.png" id="red.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.basic.html b/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.basic.html
new file mode 100644
index 00000000000..88c624f2e54
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.basic.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('green-16x16.png');
+var pattern = ctx.createPattern(img, 'repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green-16x16.png" id="green-16x16.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.coord1.html b/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.coord1.html
new file mode 100644
index 00000000000..80815c56697
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.coord1.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('rgrg-256x256.png');
+var pattern = ctx.createPattern(img, 'repeat');
+ctx.fillStyle = pattern;
+ctx.translate(-128, -78);
+ctx.fillRect(128, 78, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_rgrg-256x256.png" id="rgrg-256x256.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.coord2.html b/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.coord2.html
new file mode 100644
index 00000000000..e74a4c98721
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.coord2.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+var img = document.getElementById('ggrr-256x256.png');
+var pattern = ctx.createPattern(img, 'repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_ggrr-256x256.png" id="ggrr-256x256.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.coord3.html b/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.coord3.html
new file mode 100644
index 00000000000..1929bb907eb
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.coord3.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+var img = document.getElementById('rgrg-256x256.png');
+var pattern = ctx.createPattern(img, 'repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(-128, -78);
+ctx.fillRect(128, 78, 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_rgrg-256x256.png" id="rgrg-256x256.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.outside.html b/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.outside.html
new file mode 100644
index 00000000000..d0319f7149c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.repeat.outside.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('green-16x16.png');
+var pattern = ctx.createPattern(img, 'repeat');
+ctx.fillStyle = pattern;
+ctx.translate(50, 25);
+ctx.fillRect(-50, -25, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green-16x16.png" id="green-16x16.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.repeatx.basic.html b/mozilla/content/canvas/test/test_2d.pattern.paint.repeatx.basic.html
new file mode 100644
index 00000000000..d4fb45f5899
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.repeatx.basic.html
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 16);
+
+var img = document.getElementById('green-16x16.png');
+var pattern = ctx.createPattern(img, 'repeat-x');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green-16x16.png" id="green-16x16.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.repeatx.coord1.html b/mozilla/content/canvas/test/test_2d.pattern.paint.repeatx.coord1.html
new file mode 100644
index 00000000000..560cf01b4bd
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.repeatx.coord1.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red-16x16.png');
+var pattern = ctx.createPattern(img, 'repeat-x');
+ctx.fillStyle = pattern;
+ctx.translate(0, 16);
+ctx.fillRect(0, -16, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 16);
+
+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);
+isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
+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();
+});
+</script>
+<img src="image_red-16x16.png" id="red-16x16.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.repeatx.outside.html b/mozilla/content/canvas/test/test_2d.pattern.paint.repeatx.outside.html
new file mode 100644
index 00000000000..66386af585c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.repeatx.outside.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red-16x16.png');
+var pattern = ctx.createPattern(img, 'repeat-x');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 16);
+
+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);
+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();
+});
+</script>
+<img src="image_red-16x16.png" id="red-16x16.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.repeaty.basic.html b/mozilla/content/canvas/test/test_2d.pattern.paint.repeaty.basic.html
new file mode 100644
index 00000000000..8c3f33e2b1a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.repeaty.basic.html
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 16, 50);
+
+var img = document.getElementById('green-16x16.png');
+var pattern = ctx.createPattern(img, 'repeat-y');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green-16x16.png" id="green-16x16.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.repeaty.coord1.html b/mozilla/content/canvas/test/test_2d.pattern.paint.repeaty.coord1.html
new file mode 100644
index 00000000000..d2b7bcd7fe2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.repeaty.coord1.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red-16x16.png');
+var pattern = ctx.createPattern(img, 'repeat-y');
+ctx.fillStyle = pattern;
+ctx.translate(48, 0);
+ctx.fillRect(-48, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 16, 50);
+
+todo_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);
+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);
+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();
+});
+</script>
+<img src="image_red-16x16.png" id="red-16x16.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.paint.repeaty.outside.html b/mozilla/content/canvas/test/test_2d.pattern.paint.repeaty.outside.html
new file mode 100644
index 00000000000..2c80e6ba5c0
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.paint.repeaty.outside.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red-16x16.png');
+var pattern = ctx.createPattern(img, 'repeat-y');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 16, 50);
+
+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);
+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();
+});
+</script>
+<img src="image_red-16x16.png" id="red-16x16.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.repeat.case.html b/mozilla/content/canvas/test/test_2d.pattern.repeat.case.html
new file mode 100644
index 00000000000..8a0b80261a2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.repeat.case.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<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">
+<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.createPattern(canvas, "Repeat");
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.repeat.empty.html b/mozilla/content/canvas/test/test_2d.pattern.repeat.empty.html
new file mode 100644
index 00000000000..300fc8bfd3e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.repeat.empty.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+var img = document.getElementById('green-1x1.png');
+var pattern = ctx.createPattern(img, "");
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 200, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green-1x1.png" id="green-1x1.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.repeat.missing.html b/mozilla/content/canvas/test/test_2d.pattern.repeat.missing.html
new file mode 100644
index 00000000000..0f51a446668
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.repeat.missing.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.pattern.repeat.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">
+<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.createPattern(canvas);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.repeat.null.html b/mozilla/content/canvas/test/test_2d.pattern.repeat.null.html
new file mode 100644
index 00000000000..69ab1917c4e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.repeat.null.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+var img = document.getElementById('green-1x1.png');
+var pattern = ctx.createPattern(img, null);
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+<img src="image_green-1x1.png" id="green-1x1.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.repeat.nullsuffix.html b/mozilla/content/canvas/test/test_2d.pattern.repeat.nullsuffix.html
new file mode 100644
index 00000000000..ad1807c9508
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.repeat.nullsuffix.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<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">
+<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.createPattern(canvas, "repeat\0");
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.repeat.undefined.html b/mozilla/content/canvas/test/test_2d.pattern.repeat.undefined.html
new file mode 100644
index 00000000000..adc6c47930e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.repeat.undefined.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<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">
+<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.createPattern(canvas, undefined);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.pattern.repeat.unrecognised.html b/mozilla/content/canvas/test/test_2d.pattern.repeat.unrecognised.html
new file mode 100644
index 00000000000..eb3dbb5b8ea
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.pattern.repeat.unrecognised.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<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">
+<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.createPattern(canvas, "invalid");
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.bitmap.html b/mozilla/content/canvas/test/test_2d.state.saverestore.bitmap.html
new file mode 100644
index 00000000000..45af1c80b57
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.bitmap.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.bitmap</title>
+<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;
+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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.save();
+ctx.fillStyle = '#0f0';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.clip.html b/mozilla/content/canvas/test/test_2d.state.saverestore.clip.html
new file mode 100644
index 00000000000..2051507682b
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.clip.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.save();
+ctx.rect(0, 0, 1, 1);
+ctx.clip();
+ctx.restore();
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.fillStyle.html b/mozilla/content/canvas/test/test_2d.state.saverestore.fillStyle.html
new file mode 100644
index 00000000000..c2f758f3ddb
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.fillStyle.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.fillStyle</title>
+<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');
+
+// Test that restore() undoes any modifications
+var old = ctx.fillStyle;
+ctx.save();
+ctx.fillStyle = "#ff0000";
+ctx.restore();
+ok(ctx.fillStyle === old, "ctx.fillStyle === old");
+
+// Also test that save() doesn't modify the values
+ctx.fillStyle = "#ff0000";
+old = ctx.fillStyle;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against "#ff0000"
+ctx.save();
+ok(ctx.fillStyle === old, "ctx.fillStyle === old");
+ctx.restore();
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.globalAlpha.html b/mozilla/content/canvas/test/test_2d.state.saverestore.globalAlpha.html
new file mode 100644
index 00000000000..7f929136a55
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.globalAlpha.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.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">
+<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');
+
+// Test that restore() undoes any modifications
+var old = ctx.globalAlpha;
+ctx.save();
+ctx.globalAlpha = 0.5;
+ctx.restore();
+ok(ctx.globalAlpha === old, "ctx.globalAlpha === old");
+
+// Also test that save() doesn't modify the values
+ctx.globalAlpha = 0.5;
+old = ctx.globalAlpha;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against 0.5
+ctx.save();
+ok(ctx.globalAlpha === old, "ctx.globalAlpha === old");
+ctx.restore();
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.globalCompositeOperation.html b/mozilla/content/canvas/test/test_2d.state.saverestore.globalCompositeOperation.html
new file mode 100644
index 00000000000..386db513f31
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.globalCompositeOperation.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.globalCompositeOperation</title>
+<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');
+
+// Test that restore() undoes any modifications
+var old = ctx.globalCompositeOperation;
+ctx.save();
+ctx.globalCompositeOperation = "copy";
+ctx.restore();
+ok(ctx.globalCompositeOperation === old, "ctx.globalCompositeOperation === old");
+
+// Also test that save() doesn't modify the values
+ctx.globalCompositeOperation = "copy";
+old = ctx.globalCompositeOperation;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against "copy"
+ctx.save();
+ok(ctx.globalCompositeOperation === old, "ctx.globalCompositeOperation === old");
+ctx.restore();
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.lineCap.html b/mozilla/content/canvas/test/test_2d.state.saverestore.lineCap.html
new file mode 100644
index 00000000000..f9caf5d6342
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.lineCap.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.lineCap</title>
+<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');
+
+// Test that restore() undoes any modifications
+var old = ctx.lineCap;
+ctx.save();
+ctx.lineCap = "round";
+ctx.restore();
+ok(ctx.lineCap === old, "ctx.lineCap === old");
+
+// Also test that save() doesn't modify the values
+ctx.lineCap = "round";
+old = ctx.lineCap;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against "round"
+ctx.save();
+ok(ctx.lineCap === old, "ctx.lineCap === old");
+ctx.restore();
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.lineJoin.html b/mozilla/content/canvas/test/test_2d.state.saverestore.lineJoin.html
new file mode 100644
index 00000000000..92b15d976ca
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.lineJoin.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.lineJoin</title>
+<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');
+
+// Test that restore() undoes any modifications
+var old = ctx.lineJoin;
+ctx.save();
+ctx.lineJoin = "round";
+ctx.restore();
+ok(ctx.lineJoin === old, "ctx.lineJoin === old");
+
+// Also test that save() doesn't modify the values
+ctx.lineJoin = "round";
+old = ctx.lineJoin;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against "round"
+ctx.save();
+ok(ctx.lineJoin === old, "ctx.lineJoin === old");
+ctx.restore();
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.lineWidth.html b/mozilla/content/canvas/test/test_2d.state.saverestore.lineWidth.html
new file mode 100644
index 00000000000..7087499e849
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.lineWidth.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.lineWidth</title>
+<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');
+
+// Test that restore() undoes any modifications
+var old = ctx.lineWidth;
+ctx.save();
+ctx.lineWidth = 0.5;
+ctx.restore();
+ok(ctx.lineWidth === old, "ctx.lineWidth === old");
+
+// Also test that save() doesn't modify the values
+ctx.lineWidth = 0.5;
+old = ctx.lineWidth;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against 0.5
+ctx.save();
+ok(ctx.lineWidth === old, "ctx.lineWidth === old");
+ctx.restore();
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.miterLimit.html b/mozilla/content/canvas/test/test_2d.state.saverestore.miterLimit.html
new file mode 100644
index 00000000000..9f6d6be75c3
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.miterLimit.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.miterLimit</title>
+<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');
+
+// Test that restore() undoes any modifications
+var old = ctx.miterLimit;
+ctx.save();
+ctx.miterLimit = 0.5;
+ctx.restore();
+ok(ctx.miterLimit === old, "ctx.miterLimit === old");
+
+// Also test that save() doesn't modify the values
+ctx.miterLimit = 0.5;
+old = ctx.miterLimit;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against 0.5
+ctx.save();
+ok(ctx.miterLimit === old, "ctx.miterLimit === old");
+ctx.restore();
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.path.html b/mozilla/content/canvas/test/test_2d.state.saverestore.path.html
new file mode 100644
index 00000000000..a8c63d2062c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.path.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.save();
+ctx.rect(0, 0, 100, 50);
+ctx.restore();
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.shadowBlur.html b/mozilla/content/canvas/test/test_2d.state.saverestore.shadowBlur.html
new file mode 100644
index 00000000000..d9d1ae81dcb
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.shadowBlur.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.shadowBlur</title>
+<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');
+
+// Test that restore() undoes any modifications
+var old = ctx.shadowBlur;
+ctx.save();
+ctx.shadowBlur = 5;
+ctx.restore();
+ok(ctx.shadowBlur === old, "ctx.shadowBlur === old");
+
+// Also test that save() doesn't modify the values
+ctx.shadowBlur = 5;
+old = ctx.shadowBlur;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against 5
+ctx.save();
+ok(ctx.shadowBlur === old, "ctx.shadowBlur === old");
+ctx.restore();
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.shadowColor.html b/mozilla/content/canvas/test/test_2d.state.saverestore.shadowColor.html
new file mode 100644
index 00000000000..ce1680e134d
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.shadowColor.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.shadowColor</title>
+<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');
+
+// Test that restore() undoes any modifications
+var old = ctx.shadowColor;
+ctx.save();
+ctx.shadowColor = "#ff0000";
+ctx.restore();
+ok(ctx.shadowColor === old, "ctx.shadowColor === old");
+
+// Also test that save() doesn't modify the values
+ctx.shadowColor = "#ff0000";
+old = ctx.shadowColor;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against "#ff0000"
+ctx.save();
+ok(ctx.shadowColor === old, "ctx.shadowColor === old");
+ctx.restore();
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.shadowOffsetX.html b/mozilla/content/canvas/test/test_2d.state.saverestore.shadowOffsetX.html
new file mode 100644
index 00000000000..5a4deaba47a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.shadowOffsetX.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.shadowOffsetX</title>
+<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');
+
+// Test that restore() undoes any modifications
+var old = ctx.shadowOffsetX;
+ctx.save();
+ctx.shadowOffsetX = 5;
+ctx.restore();
+ok(ctx.shadowOffsetX === old, "ctx.shadowOffsetX === old");
+
+// Also test that save() doesn't modify the values
+ctx.shadowOffsetX = 5;
+old = ctx.shadowOffsetX;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against 5
+ctx.save();
+ok(ctx.shadowOffsetX === old, "ctx.shadowOffsetX === old");
+ctx.restore();
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.shadowOffsetY.html b/mozilla/content/canvas/test/test_2d.state.saverestore.shadowOffsetY.html
new file mode 100644
index 00000000000..00a5410eef3
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.shadowOffsetY.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.shadowOffsetY</title>
+<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');
+
+// Test that restore() undoes any modifications
+var old = ctx.shadowOffsetY;
+ctx.save();
+ctx.shadowOffsetY = 5;
+ctx.restore();
+ok(ctx.shadowOffsetY === old, "ctx.shadowOffsetY === old");
+
+// Also test that save() doesn't modify the values
+ctx.shadowOffsetY = 5;
+old = ctx.shadowOffsetY;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against 5
+ctx.save();
+ok(ctx.shadowOffsetY === old, "ctx.shadowOffsetY === old");
+ctx.restore();
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.stack.html b/mozilla/content/canvas/test/test_2d.state.saverestore.stack.html
new file mode 100644
index 00000000000..b3fe003cdd9
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.stack.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.stack</title>
+<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.lineWidth = 1;
+ctx.save();
+ctx.lineWidth = 2;
+ctx.save();
+ctx.lineWidth = 3;
+ok(ctx.lineWidth == 3, "ctx.lineWidth == 3");
+ctx.restore();
+ok(ctx.lineWidth == 2, "ctx.lineWidth == 2");
+ctx.restore();
+ok(ctx.lineWidth == 1, "ctx.lineWidth == 1");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.stackdepth.html b/mozilla/content/canvas/test/test_2d.state.saverestore.stackdepth.html
new file mode 100644
index 00000000000..5f0841389f7
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.stackdepth.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.stackdepth</title>
+<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 limit = 512;
+for (var i = 1; i < limit; ++i)
+{
+    ctx.save();
+    ctx.lineWidth = i;
+}
+for (var i = limit-1; i > 0; --i)
+{
+    ok(ctx.lineWidth == i, "ctx.lineWidth == i");
+    ctx.restore();
+}
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.strokeStyle.html b/mozilla/content/canvas/test/test_2d.state.saverestore.strokeStyle.html
new file mode 100644
index 00000000000..d0d17e7afe8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.strokeStyle.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.strokeStyle</title>
+<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');
+
+// Test that restore() undoes any modifications
+var old = ctx.strokeStyle;
+ctx.save();
+ctx.strokeStyle = "#ff0000";
+ctx.restore();
+ok(ctx.strokeStyle === old, "ctx.strokeStyle === old");
+
+// Also test that save() doesn't modify the values
+ctx.strokeStyle = "#ff0000";
+old = ctx.strokeStyle;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against "#ff0000"
+ctx.save();
+ok(ctx.strokeStyle === old, "ctx.strokeStyle === old");
+ctx.restore();
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.state.saverestore.transformation.html b/mozilla/content/canvas/test/test_2d.state.saverestore.transformation.html
new file mode 100644
index 00000000000..44fba523b2a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.state.saverestore.transformation.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.state.saverestore.transformation</title>
+<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;
+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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.save();
+ctx.translate(200, 0);
+ctx.restore();
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.strokeRect.basic.html b/mozilla/content/canvas/test/test_2d.strokeRect.basic.html
new file mode 100644
index 00000000000..fe25bb0ae97
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.strokeRect.basic.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.strokeRect.clip.html b/mozilla/content/canvas/test/test_2d.strokeRect.clip.html
new file mode 100644
index 00000000000..86048ffdadb
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.strokeRect.clip.html
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(0, 0, 16, 16);
+ctx.clip();
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.strokeRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.strokeRect.globalalpha.html b/mozilla/content/canvas/test/test_2d.strokeRect.globalalpha.html
new file mode 100644
index 00000000000..bae4526bd20
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.strokeRect.globalalpha.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.globalAlpha = 0;
+ctx.strokeStyle = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.strokeRect.globalcomposite.html b/mozilla/content/canvas/test/test_2d.strokeRect.globalcomposite.html
new file mode 100644
index 00000000000..1f896737823
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.strokeRect.globalcomposite.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.globalCompositeOperation = 'source-in';
+ctx.strokeStyle = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.strokeRect.negative.html b/mozilla/content/canvas/test/test_2d.strokeRect.negative.html
new file mode 100644
index 00000000000..7cff5672297
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.strokeRect.negative.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<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">
+<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.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");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.strokeRect.path.html b/mozilla/content/canvas/test/test_2d.strokeRect.path.html
new file mode 100644
index 00000000000..16e17bb5e1c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.strokeRect.path.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.beginPath();
+ctx.rect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 5;
+ctx.strokeRect(0, 0, 16, 16);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.strokeRect.shadow.html b/mozilla/content/canvas/test/test_2d.strokeRect.shadow.html
new file mode 100644
index 00000000000..95f1d502e0e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.strokeRect.shadow.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.shadowBlur = 0;
+ctx.shadowOffsetX = 0;
+ctx.shadowOffsetY = 50;
+
+// Shadows are optional, so just test that if they apply to fill() then they apply to strokeRect() too
+ctx.beginPath();
+ctx.rect(0, -50, 100, 50);
+ctx.shadowColor = '#f00';
+ctx.fill();
+
+ctx.shadowColor = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.strokeRect.transform.html b/mozilla/content/canvas/test/test_2d.strokeRect.transform.html
new file mode 100644
index 00000000000..c8c330a74a2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.strokeRect.transform.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.scale(10, 10);
+ctx.translate(0, 5);
+ctx.strokeStyle = '#0f0';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.strokeRect.zero.1.html b/mozilla/content/canvas/test/test_2d.strokeRect.zero.1.html
new file mode 100644
index 00000000000..49c75598b74
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.strokeRect.zero.1.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.strokeRect.zero.2.html b/mozilla/content/canvas/test/test_2d.strokeRect.zero.2.html
new file mode 100644
index 00000000000..c5ef93e7ed3
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.strokeRect.zero.2.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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);
+}
+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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 250;
+ctx.lineCap = 'round';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.strokeRect.zero.3.html b/mozilla/content/canvas/test/test_2d.strokeRect.zero.3.html
new file mode 100644
index 00000000000..2d93f177a8f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.strokeRect.zero.3.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.strokeRect.zero.4.html b/mozilla/content/canvas/test/test_2d.strokeRect.zero.4.html
new file mode 100644
index 00000000000..bc1d75aa4a4
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.strokeRect.zero.4.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#f00';
+ctx.lineWidth = 250;
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.strokeRect.zero.5.html b/mozilla/content/canvas/test/test_2d.strokeRect.zero.5.html
new file mode 100644
index 00000000000..a1e47225090
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.strokeRect.zero.5.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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.strokeStyle = '#0f0';
+ctx.lineWidth = 250;
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.strokeStyle.default.html b/mozilla/content/canvas/test/test_2d.strokeStyle.default.html
new file mode 100644
index 00000000000..afdeb1e71d6
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.strokeStyle.default.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<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">
+<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');
+
+ok(ctx.strokeStyle == '#000000', "ctx.strokeStyle == '#000000'");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.order.html b/mozilla/content/canvas/test/test_2d.transformation.order.html
new file mode 100644
index 00000000000..c8f437b1692
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.order.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.order</title>
+<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;
+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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.scale(2, 1);
+ctx.rotate(Math.PI / 2);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.rotate.direction.html b/mozilla/content/canvas/test/test_2d.transformation.rotate.direction.html
new file mode 100644
index 00000000000..68f3924ba4a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.rotate.direction.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.rotate.direction</title>
+<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;
+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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.rotate(Math.PI / 2);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.rotate.infinity.html b/mozilla/content/canvas/test/test_2d.transformation.rotate.infinity.html
new file mode 100644
index 00000000000..5c8d31208d8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.rotate.infinity.html
@@ -0,0 +1,24 @@
+<!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/mozilla/content/canvas/test/test_2d.transformation.rotate.nan.html b/mozilla/content/canvas/test/test_2d.transformation.rotate.nan.html
new file mode 100644
index 00000000000..11d6c3eddc9
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.rotate.nan.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.rotate.nan</title>
+<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(NaN);
+} 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/mozilla/content/canvas/test/test_2d.transformation.rotate.neginfinity.html b/mozilla/content/canvas/test/test_2d.transformation.rotate.neginfinity.html
new file mode 100644
index 00000000000..894bc2cac28
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.rotate.neginfinity.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.rotate.neginfinity</title>
+<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/mozilla/content/canvas/test/test_2d.transformation.rotate.radians.html b/mozilla/content/canvas/test/test_2d.transformation.rotate.radians.html
new file mode 100644
index 00000000000..c0a0c103a21
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.rotate.radians.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.rotate.radians</title>
+<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;
+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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.rotate(Math.PI);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.rotate.wrap.html b/mozilla/content/canvas/test/test_2d.transformation.rotate.wrap.html
new file mode 100644
index 00000000000..852d2c1d5fc
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.rotate.wrap.html
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.rotate.wrap</title>
+<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;
+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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+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
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -50, 100, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.rotate.wrapnegative.html b/mozilla/content/canvas/test/test_2d.transformation.rotate.wrapnegative.html
new file mode 100644
index 00000000000..da731889e60
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.rotate.wrapnegative.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.rotate.wrapnegative</title>
+<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;
+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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.rotate(-Math.PI * (1 + 4096));
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -50, 100, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.rotate.zero.html b/mozilla/content/canvas/test/test_2d.transformation.rotate.zero.html
new file mode 100644
index 00000000000..26726ac69b5
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.rotate.zero.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.rotate.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.rotate(0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.scale.basic.html b/mozilla/content/canvas/test/test_2d.transformation.scale.basic.html
new file mode 100644
index 00000000000..efa468fa346
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.scale.basic.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.scale.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.scale(2, 4);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.scale.large.html b/mozilla/content/canvas/test/test_2d.transformation.scale.large.html
new file mode 100644
index 00000000000..4657dbdea13
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.scale.large.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.scale.large</title>
+<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;
+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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.scale(1e5, 1e5);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.scale.multiple.html b/mozilla/content/canvas/test/test_2d.transformation.scale.multiple.html
new file mode 100644
index 00000000000..f83be4ad9d7
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.scale.multiple.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.scale.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.scale(Math.sqrt(2), Math.sqrt(2));
+ctx.scale(Math.sqrt(2), Math.sqrt(2));
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.scale.negative.html b/mozilla/content/canvas/test/test_2d.transformation.scale.negative.html
new file mode 100644
index 00000000000..20c80f1a39a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.scale.negative.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.scale.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.save();
+ctx.scale(-1, 1);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-50, 0, 50, 50);
+ctx.restore();
+
+ctx.save();
+ctx.scale(1, -1);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(50, -50, 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);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.scale.zero.html b/mozilla/content/canvas/test/test_2d.transformation.scale.zero.html
new file mode 100644
index 00000000000..af734fae499
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.scale.zero.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.scale.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.save();
+ctx.translate(50, 0);
+ctx.scale(0, 1);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.restore();
+
+ctx.save();
+ctx.translate(0, 25);
+ctx.scale(1, 0);
+ctx.fillStyle = '#f00';
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.setTransform.multiple.html b/mozilla/content/canvas/test/test_2d.transformation.setTransform.multiple.html
new file mode 100644
index 00000000000..73f5079347a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.setTransform.multiple.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.setTransform(1/2,0, 0,1/2, 0,0);
+ctx.setTransform(2,0, 0,2, 0,0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.setTransform.skewed.html b/mozilla/content/canvas/test/test_2d.transformation.setTransform.skewed.html
new file mode 100644
index 00000000000..2dba07bfae9
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.setTransform.skewed.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+<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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+// Create green with a red square ring inside it
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(20, 10, 60, 30);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(40, 20, 20, 10);
+
+// Draw a skewed shape to fill that gap, to make sure it is aligned correctly
+ctx.setTransform(1,4, 2,3, 5,6);
+// Post-transform coordinates:
+//   [[20,10],[80,10],[80,40],[20,40],[20,10],[40,20],[40,30],[60,30],[60,20],[40,20],[20,10]];
+// Hence pre-transform coordinates:
+var pts=[[-7.4,11.2],[-43.4,59.2],[-31.4,53.2],[4.6,5.2],[-7.4,11.2],
+         [-15.4,25.2],[-11.4,23.2],[-23.4,39.2],[-27.4,41.2],[-15.4,25.2],
+         [-7.4,11.2]];
+ctx.beginPath();
+ctx.moveTo(pts[0][0], pts[0][1]);
+for (var i = 0; i < pts.length; ++i)
+    ctx.lineTo(pts[i][0], pts[i][1]);
+ctx.fill();
+isPixel(ctx, 21,11, 0,255,0,255, "21,11", "0,255,0,255", 0);
+isPixel(ctx, 79,11, 0,255,0,255, "79,11", "0,255,0,255", 0);
+isPixel(ctx, 21,39, 0,255,0,255, "21,39", "0,255,0,255", 0);
+isPixel(ctx, 79,39, 0,255,0,255, "79,39", "0,255,0,255", 0);
+isPixel(ctx, 39,19, 0,255,0,255, "39,19", "0,255,0,255", 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.transform.identity.html b/mozilla/content/canvas/test/test_2d.transformation.transform.identity.html
new file mode 100644
index 00000000000..f514555edfc
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.transform.identity.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.transform.identity</title>
+<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;
+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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.transform(1,0, 0,1, 0,0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.transform.multiply.html b/mozilla/content/canvas/test/test_2d.transformation.transform.multiply.html
new file mode 100644
index 00000000000..7d9720d4bc1
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.transform.multiply.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.transform.multiply</title>
+<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;
+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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.transform(1,2, 3,4, 5,6);
+ctx.transform(-2,1, 3/2,-1/2, 1,-2);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.transform.skewed.html b/mozilla/content/canvas/test/test_2d.transformation.transform.skewed.html
new file mode 100644
index 00000000000..152ac581d49
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.transform.skewed.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.transform.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+// Create green with a red square ring inside it
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(20, 10, 60, 30);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(40, 20, 20, 10);
+
+// Draw a skewed shape to fill that gap, to make sure it is aligned correctly
+ctx.transform(1,4, 2,3, 5,6);
+// Post-transform coordinates:
+//   [[20,10],[80,10],[80,40],[20,40],[20,10],[40,20],[40,30],[60,30],[60,20],[40,20],[20,10]];
+// Hence pre-transform coordinates:
+var pts=[[-7.4,11.2],[-43.4,59.2],[-31.4,53.2],[4.6,5.2],[-7.4,11.2],
+         [-15.4,25.2],[-11.4,23.2],[-23.4,39.2],[-27.4,41.2],[-15.4,25.2],
+         [-7.4,11.2]];
+ctx.beginPath();
+ctx.moveTo(pts[0][0], pts[0][1]);
+for (var i = 0; i < pts.length; ++i)
+    ctx.lineTo(pts[i][0], pts[i][1]);
+ctx.fill();
+isPixel(ctx, 21,11, 0,255,0,255, "21,11", "0,255,0,255", 0);
+isPixel(ctx, 79,11, 0,255,0,255, "79,11", "0,255,0,255", 0);
+isPixel(ctx, 21,39, 0,255,0,255, "21,39", "0,255,0,255", 0);
+isPixel(ctx, 79,39, 0,255,0,255, "79,39", "0,255,0,255", 0);
+isPixel(ctx, 39,19, 0,255,0,255, "39,19", "0,255,0,255", 0);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.transformation.translate.basic.html b/mozilla/content/canvas/test/test_2d.transformation.translate.basic.html
new file mode 100644
index 00000000000..7e9ef161bdd
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.transformation.translate.basic.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.transformation.translate.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(100, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.type.delete.html b/mozilla/content/canvas/test/test_2d.type.delete.html
new file mode 100644
index 00000000000..f5792d242b1
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.type.delete.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.type.delete</title>
+<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');
+
+delete window.CanvasRenderingContext2D;
+ok(window.CanvasRenderingContext2D !== undefined, "window.CanvasRenderingContext2D !== undefined");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.type.exists.html b/mozilla/content/canvas/test/test_2d.type.exists.html
new file mode 100644
index 00000000000..ea88ed25b59
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.type.exists.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.type.exists</title>
+<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');
+
+ok(window.CanvasRenderingContext2D, "window.CanvasRenderingContext2D");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.type.extend.html b/mozilla/content/canvas/test/test_2d.type.extend.html
new file mode 100644
index 00000000000..da92d0f2ad2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.type.extend.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.type.extend</title>
+<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;
+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');
+
+window.CanvasRenderingContext2D.prototype.fillRectGreen = function (x, y, w, h)
+{
+    this.fillStyle = '#0f0';
+    this.fillRect(x, y, w, h);
+};
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.type.name.html b/mozilla/content/canvas/test/test_2d.type.name.html
new file mode 100644
index 00000000000..6e3d33b4ee1
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.type.name.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.type.name</title>
+<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');
+
+ok(Object.prototype.toString.call(ctx) === '[object CanvasRenderingContext2D]', "Object.prototype.toString.call(ctx) === '[object CanvasRenderingContext2D]'");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.type.prototype.html b/mozilla/content/canvas/test/test_2d.type.prototype.html
new file mode 100644
index 00000000000..6af8fedda4b
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.type.prototype.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.type.prototype</title>
+<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');
+
+ok(window.CanvasRenderingContext2D.prototype, "window.CanvasRenderingContext2D.prototype");
+ok(window.CanvasRenderingContext2D.prototype.fill, "window.CanvasRenderingContext2D.prototype.fill");
+window.CanvasRenderingContext2D.prototype = null;
+ok(window.CanvasRenderingContext2D.prototype, "window.CanvasRenderingContext2D.prototype");
+delete window.CanvasRenderingContext2D.prototype;
+ok(window.CanvasRenderingContext2D.prototype, "window.CanvasRenderingContext2D.prototype");
+window.CanvasRenderingContext2D.prototype.fill = 1;
+ok(window.CanvasRenderingContext2D.prototype.fill === 1, "window.CanvasRenderingContext2D.prototype.fill === 1");
+delete window.CanvasRenderingContext2D.prototype.fill;
+todo(window.CanvasRenderingContext2D.prototype.fill === undefined, "window.CanvasRenderingContext2D.prototype.fill === undefined");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.type.replace.html b/mozilla/content/canvas/test/test_2d.type.replace.html
new file mode 100644
index 00000000000..8a37d4106eb
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.type.replace.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.type.replace</title>
+<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;
+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');
+
+var fillRect = window.CanvasRenderingContext2D.prototype.fillRect;
+window.CanvasRenderingContext2D.prototype.fillRect = function (x, y, w, h)
+{
+    this.fillStyle = '#0f0';
+    fillRect.call(this, x, y, w, h);
+};
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_2d.voidreturn.html b/mozilla/content/canvas/test/test_2d.voidreturn.html
new file mode 100644
index 00000000000..12fbaeb12b8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_2d.voidreturn.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<title>Canvas test: 2d.voidreturn</title>
+<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');
+
+ok(ctx.save() === undefined, "ctx.save() === undefined");
+ok(ctx.restore() === undefined, "ctx.restore() === undefined");
+ok(ctx.scale(1, 1) === undefined, "ctx.scale(1, 1) === undefined");
+ok(ctx.rotate(0) === undefined, "ctx.rotate(0) === undefined");
+ok(ctx.translate(0, 0) === undefined, "ctx.translate(0, 0) === undefined");
+if (ctx.transform) { // (avoid spurious failures, since the aim here is not to test that all features are supported)
+    ok(ctx.transform(1, 0, 0, 1, 0, 0) === undefined, "ctx.transform(1, 0, 0, 1, 0, 0) === undefined");
+}
+if (ctx.setTransform) {
+    ok(ctx.setTransform(1, 0, 0, 1, 0, 0) === undefined, "ctx.setTransform(1, 0, 0, 1, 0, 0) === undefined");
+}
+ok(ctx.clearRect(0, 0, 0, 0) === undefined, "ctx.clearRect(0, 0, 0, 0) === undefined");
+ok(ctx.fillRect(0, 0, 0, 0) === undefined, "ctx.fillRect(0, 0, 0, 0) === undefined");
+ok(ctx.strokeRect(0, 0, 0, 0) === undefined, "ctx.strokeRect(0, 0, 0, 0) === undefined");
+ok(ctx.beginPath() === undefined, "ctx.beginPath() === undefined");
+ok(ctx.closePath() === undefined, "ctx.closePath() === undefined");
+ok(ctx.moveTo(0, 0) === undefined, "ctx.moveTo(0, 0) === undefined");
+ok(ctx.lineTo(0, 0) === undefined, "ctx.lineTo(0, 0) === undefined");
+ok(ctx.quadraticCurveTo(0, 0, 0, 0) === undefined, "ctx.quadraticCurveTo(0, 0, 0, 0) === undefined");
+ok(ctx.bezierCurveTo(0, 0, 0, 0, 0, 0) === undefined, "ctx.bezierCurveTo(0, 0, 0, 0, 0, 0) === undefined");
+ok(ctx.arcTo(0, 0, 0, 0, 1) === undefined, "ctx.arcTo(0, 0, 0, 0, 1) === undefined");
+ok(ctx.rect(0, 0, 0, 0) === undefined, "ctx.rect(0, 0, 0, 0) === undefined");
+ok(ctx.arc(0, 0, 1, 0, 0, true) === undefined, "ctx.arc(0, 0, 1, 0, 0, true) === undefined");
+ok(ctx.fill() === undefined, "ctx.fill() === undefined");
+ok(ctx.stroke() === undefined, "ctx.stroke() === undefined");
+ok(ctx.clip() === undefined, "ctx.clip() === undefined");
+if (ctx.putImageData) {
+    ok(ctx.putImageData(ctx.getImageData(0, 0, 1, 1), 0, 0) === undefined, "ctx.putImageData(ctx.getImageData(0, 0, 1, 1), 0, 0) === undefined");
+}
+ok(ctx.drawImage(document.getElementById('yellow.png'), 0, 0, 0, 0, 0, 0, 0, 0) === undefined, "ctx.drawImage(document.getElementById('yellow.png'), 0, 0, 0, 0, 0, 0, 0, 0) === undefined");
+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();
+});
+</script>
+<img src="image_yellow.png" id="yellow.png" class="resource">
+
diff --git a/mozilla/content/canvas/test/test_fallback.basic.html b/mozilla/content/canvas/test/test_fallback.basic.html
new file mode 100644
index 00000000000..b516fd41452
--- /dev/null
+++ b/mozilla/content/canvas/test/test_fallback.basic.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: fallback.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">
+<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');
+
+ok(canvas.childNodes.length == 1, "canvas.childNodes.length == 1");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_fallback.multiple.html b/mozilla/content/canvas/test/test_fallback.multiple.html
new file mode 100644
index 00000000000..30264eef9b9
--- /dev/null
+++ b/mozilla/content/canvas/test/test_fallback.multiple.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: fallback.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">
+<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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.childNodes.length == 2, "canvas.childNodes.length == 2");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_fallback.nested.html b/mozilla/content/canvas/test/test_fallback.nested.html
new file mode 100644
index 00000000000..80ad77053b2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_fallback.nested.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: fallback.nested</title>
+<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"><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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.childNodes.length == 2, "canvas.childNodes.length == 2");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_initial.colour.html b/mozilla/content/canvas/test/test_initial.colour.html
new file mode 100644
index 00000000000..7b0c9ce68e9
--- /dev/null
+++ b/mozilla/content/canvas/test/test_initial.colour.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<title>Canvas test: initial.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+isPixel(ctx, 20,20, 0,0,0,0, "20,20", "0,0,0,0", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_initial.reset.2dstate.html b/mozilla/content/canvas/test/test_initial.reset.2dstate.html
new file mode 100644
index 00000000000..6b1ac189cc9
--- /dev/null
+++ b/mozilla/content/canvas/test/test_initial.reset.2dstate.html
@@ -0,0 +1,83 @@
+<!DOCTYPE HTML>
+<title>Canvas test: initial.reset.2dstate</title>
+<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');
+
+canvas.width = 100;
+var default_val;
+
+default_val = ctx.strokeStyle;
+ctx.strokeStyle = "#ff0000";
+canvas.width = 100;
+ok(ctx.strokeStyle === default_val, "ctx.strokeStyle === default_val");
+
+default_val = ctx.fillStyle;
+ctx.fillStyle = "#ff0000";
+canvas.width = 100;
+ok(ctx.fillStyle === default_val, "ctx.fillStyle === default_val");
+
+default_val = ctx.globalAlpha;
+ctx.globalAlpha = 0.5;
+canvas.width = 100;
+ok(ctx.globalAlpha === default_val, "ctx.globalAlpha === default_val");
+
+default_val = ctx.lineWidth;
+ctx.lineWidth = 0.5;
+canvas.width = 100;
+ok(ctx.lineWidth === default_val, "ctx.lineWidth === default_val");
+
+default_val = ctx.lineCap;
+ctx.lineCap = "round";
+canvas.width = 100;
+ok(ctx.lineCap === default_val, "ctx.lineCap === default_val");
+
+default_val = ctx.lineJoin;
+ctx.lineJoin = "round";
+canvas.width = 100;
+ok(ctx.lineJoin === default_val, "ctx.lineJoin === default_val");
+
+default_val = ctx.miterLimit;
+ctx.miterLimit = 0.5;
+canvas.width = 100;
+ok(ctx.miterLimit === default_val, "ctx.miterLimit === default_val");
+
+default_val = ctx.shadowOffsetX;
+ctx.shadowOffsetX = 5;
+canvas.width = 100;
+ok(ctx.shadowOffsetX === default_val, "ctx.shadowOffsetX === default_val");
+
+default_val = ctx.shadowOffsetY;
+ctx.shadowOffsetY = 5;
+canvas.width = 100;
+ok(ctx.shadowOffsetY === default_val, "ctx.shadowOffsetY === default_val");
+
+default_val = ctx.shadowBlur;
+ctx.shadowBlur = 5;
+canvas.width = 100;
+ok(ctx.shadowBlur === default_val, "ctx.shadowBlur === default_val");
+
+default_val = ctx.shadowColor;
+ctx.shadowColor = "#ff0000";
+canvas.width = 100;
+ok(ctx.shadowColor === default_val, "ctx.shadowColor === default_val");
+
+default_val = ctx.globalCompositeOperation;
+ctx.globalCompositeOperation = "copy";
+canvas.width = 100;
+ok(ctx.globalCompositeOperation === default_val, "ctx.globalCompositeOperation === default_val");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_initial.reset.clip.html b/mozilla/content/canvas/test/test_initial.reset.clip.html
new file mode 100644
index 00000000000..451469cc9c1
--- /dev/null
+++ b/mozilla/content/canvas/test/test_initial.reset.clip.html
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<title>Canvas test: initial.reset.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+canvas.width = 100;
+ctx.rect(0, 0, 1, 1);
+ctx.clip();
+canvas.width = 100;
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_initial.reset.different.html b/mozilla/content/canvas/test/test_initial.reset.different.html
new file mode 100644
index 00000000000..43d9bfb84e0
--- /dev/null
+++ b/mozilla/content/canvas/test/test_initial.reset.different.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<title>Canvas test: initial.reset.different</title>
+<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" 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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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 = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_initial.reset.gradient.html b/mozilla/content/canvas/test/test_initial.reset.gradient.html
new file mode 100644
index 00000000000..27783aeee09
--- /dev/null
+++ b/mozilla/content/canvas/test/test_initial.reset.gradient.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<title>Canvas test: initial.reset.gradient</title>
+<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;
+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');
+
+canvas.width = 50;
+var g = ctx.createLinearGradient(0, 0, 100, 0);
+g.addColorStop(0, '#0f0');
+g.addColorStop(1, '#0f0');
+canvas.width = 100;
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_initial.reset.path.html b/mozilla/content/canvas/test/test_initial.reset.path.html
new file mode 100644
index 00000000000..bc080a04b8c
--- /dev/null
+++ b/mozilla/content/canvas/test/test_initial.reset.path.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: initial.reset.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+canvas.width = 100;
+ctx.rect(0, 0, 100, 50);
+canvas.width = 100;
+ctx.fillStyle = '#f00';
+ctx.fill();
+isPixel(ctx, 20,20, 0,0,0,0, "20,20", "0,0,0,0", 0);
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_initial.reset.pattern.html b/mozilla/content/canvas/test/test_initial.reset.pattern.html
new file mode 100644
index 00000000000..4223e06f50e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_initial.reset.pattern.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<title>Canvas test: initial.reset.pattern</title>
+<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;
+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');
+
+canvas.width = 50;
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+var p = ctx.createPattern(canvas, 'repeat-x');
+canvas.width = 100;
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_initial.reset.same.html b/mozilla/content/canvas/test/test_initial.reset.same.html
new file mode 100644
index 00000000000..07d65be31bc
--- /dev/null
+++ b/mozilla/content/canvas/test/test_initial.reset.same.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: initial.reset.same</title>
+<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" 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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+canvas.width = 100;
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_initial.reset.transform.html b/mozilla/content/canvas/test/test_initial.reset.transform.html
new file mode 100644
index 00000000000..2373d0f4035
--- /dev/null
+++ b/mozilla/content/canvas/test/test_initial.reset.transform.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<title>Canvas test: initial.reset.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">
+<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) {
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var 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');
+
+canvas.width = 100;
+ctx.scale(0, 0);
+canvas.width = 100;
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.default.html b/mozilla/content/canvas/test/test_size.attributes.default.html
new file mode 100644
index 00000000000..3f044a57fc2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.default.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.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">
+<body>
+<canvas id="c" ><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');
+
+ok(canvas.width == 300, "canvas.width == 300");
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.html b/mozilla/content/canvas/test/test_size.attributes.html
new file mode 100644
index 00000000000..a7105ef8a78
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes</title>
+<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="120" height="60"><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');
+
+ok(canvas.width == 120, "canvas.width == 120");
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.parse.badsuffix.html b/mozilla/content/canvas/test/test_size.attributes.parse.badsuffix.html
new file mode 100644
index 00000000000..fd4f298ea97
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.parse.badsuffix.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.parse.badsuffix</title>
+<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="100foo" 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');
+
+todo(canvas.width == 100, "canvas.width == 100");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.parse.floatsuffix.html b/mozilla/content/canvas/test/test_size.attributes.parse.floatsuffix.html
new file mode 100644
index 00000000000..b70fa853a0b
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.parse.floatsuffix.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.parse.floatsuffix</title>
+<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.9" 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');
+
+ok(canvas.width == 100, "canvas.width == 100");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.parse.negative.html b/mozilla/content/canvas/test/test_size.attributes.parse.negative.html
new file mode 100644
index 00000000000..a233ae45469
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.parse.negative.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.parse.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">
+<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');
+
+todo(canvas.width == 300, "canvas.width == 300");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.parse.nonnumber.html b/mozilla/content/canvas/test/test_size.attributes.parse.nonnumber.html
new file mode 100644
index 00000000000..449b2a10485
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.parse.nonnumber.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.parse.nonnumber</title>
+<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="foo" 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');
+
+ok(canvas.width == 300, "canvas.width == 300");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.parse.percentsuffix.html b/mozilla/content/canvas/test/test_size.attributes.parse.percentsuffix.html
new file mode 100644
index 00000000000..e667161a7dc
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.parse.percentsuffix.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.parse.percentsuffix</title>
+<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');
+
+ok(canvas.width == 100, "canvas.width == 100");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.parse.whitespace.html b/mozilla/content/canvas/test/test_size.attributes.parse.whitespace.html
new file mode 100644
index 00000000000..fccba51036a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.parse.whitespace.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.parse.whitespace</title>
+<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');
+
+ok(canvas.width == 100, "canvas.width == 100");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.parse.zero.html b/mozilla/content/canvas/test/test_size.attributes.parse.zero.html
new file mode 100644
index 00000000000..ba62a83d809
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.parse.zero.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.parse.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">
+<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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 0, "canvas.width == 0");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.parse.zerosuffix.html b/mozilla/content/canvas/test/test_size.attributes.parse.zerosuffix.html
new file mode 100644
index 00000000000..4a1045d66b8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.parse.zerosuffix.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.parse.zerosuffix</title>
+<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.0" 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');
+
+ok(canvas.width == 100, "canvas.width == 100");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.reflect.1.html b/mozilla/content/canvas/test/test_size.attributes.reflect.1.html
new file mode 100644
index 00000000000..d737dc06c3f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.reflect.1.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.reflect.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">
+<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');
+
+canvas.width = 120;
+canvas.height = 60;
+ok(canvas.getAttribute('width') == '120', "canvas.getAttribute('width') == '120'");
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.reflect.2.html b/mozilla/content/canvas/test/test_size.attributes.reflect.2.html
new file mode 100644
index 00000000000..1071eacecb2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.reflect.2.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.reflect.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">
+<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');
+
+canvas.setAttribute('width', '120');
+canvas.setAttribute('height', '60');
+ok(canvas.getAttribute('width') == '120', "canvas.getAttribute('width') == '120'");
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.removed.html b/mozilla/content/canvas/test/test_size.attributes.removed.html
new file mode 100644
index 00000000000..f0fda330100
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.removed.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.removed</title>
+<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="120" height="60"><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');
+
+canvas.removeAttribute('width');
+ok(canvas.width == 300, "canvas.width == 300");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.setAttribute.badsuffix.html b/mozilla/content/canvas/test/test_size.attributes.setAttribute.badsuffix.html
new file mode 100644
index 00000000000..e3e1e387fd0
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.setAttribute.badsuffix.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.setAttribute.badsuffix</title>
+<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="50" 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');
+
+canvas.setAttribute('width', '100foo');
+todo(canvas.width == 100, "canvas.width == 100");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.setAttribute.floatsuffix.html b/mozilla/content/canvas/test/test_size.attributes.setAttribute.floatsuffix.html
new file mode 100644
index 00000000000..28d2ead8897
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.setAttribute.floatsuffix.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.setAttribute.floatsuffix</title>
+<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="50" 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');
+
+canvas.setAttribute('width', '1');
+canvas.setAttribute('width', '100.9');
+ok(canvas.width == 100, "canvas.width == 100");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.setAttribute.negative.html b/mozilla/content/canvas/test/test_size.attributes.setAttribute.negative.html
new file mode 100644
index 00000000000..d6a0b3979f2
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.setAttribute.negative.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.setAttribute.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">
+<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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '-100');
+todo(canvas.width == 300, "canvas.width == 300");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.setAttribute.nonnumber.html b/mozilla/content/canvas/test/test_size.attributes.setAttribute.nonnumber.html
new file mode 100644
index 00000000000..59b18660ca0
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.setAttribute.nonnumber.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.setAttribute.nonnumber</title>
+<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="50" 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');
+
+canvas.setAttribute('width', 'foo');
+ok(canvas.width == 300, "canvas.width == 300");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.setAttribute.percentsuffix.html b/mozilla/content/canvas/test/test_size.attributes.setAttribute.percentsuffix.html
new file mode 100644
index 00000000000..c128465b342
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.setAttribute.percentsuffix.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.setAttribute.percentsuffix</title>
+<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="50" 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');
+
+canvas.setAttribute('width', '100%');
+ok(canvas.width == 100, "canvas.width == 100");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.setAttribute.whitespace.html b/mozilla/content/canvas/test/test_size.attributes.setAttribute.whitespace.html
new file mode 100644
index 00000000000..d8a73c97b51
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.setAttribute.whitespace.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.setAttribute.whitespace</title>
+<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="50" 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');
+
+canvas.setAttribute('width', '   100');
+ok(canvas.width == 100, "canvas.width == 100");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.setAttribute.zero.html b/mozilla/content/canvas/test/test_size.attributes.setAttribute.zero.html
new file mode 100644
index 00000000000..5f7f377610b
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.setAttribute.zero.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.setAttribute.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">
+<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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '0');
+ok(canvas.width == 0, "canvas.width == 0");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.setAttribute.zerosuffix.html b/mozilla/content/canvas/test/test_size.attributes.setAttribute.zerosuffix.html
new file mode 100644
index 00000000000..491d94043a8
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.setAttribute.zerosuffix.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.setAttribute.zerosuffix</title>
+<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="50" 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');
+
+canvas.setAttribute('width', '1');
+canvas.setAttribute('width', '100.0');
+ok(canvas.width == 100, "canvas.width == 100");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.style.html b/mozilla/content/canvas/test/test_size.attributes.style.html
new file mode 100644
index 00000000000..df8c08ca14e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.style.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.style</title>
+<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="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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 50, "canvas.width == 50");
+ok(canvas.height == 30, "canvas.height == 30");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.type.get.html b/mozilla/content/canvas/test/test_size.attributes.type.get.html
new file mode 100644
index 00000000000..52cac98d555
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.type.get.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.type.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">
+<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 () {
+
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width === 120, "canvas.width === 120");
+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();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_size.attributes.type.set.html b/mozilla/content/canvas/test/test_size.attributes.type.set.html
new file mode 100644
index 00000000000..a09ae352708
--- /dev/null
+++ b/mozilla/content/canvas/test/test_size.attributes.type.set.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<title>Canvas test: size.attributes.type.set</title>
+<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');
+
+canvas.width = 120;
+canvas.height = 60;
+ok(canvas.width === 120, "canvas.width === 120");
+ok(canvas.height === 60, "canvas.height === 60");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_toDataURL.complexcolours.html b/mozilla/content/canvas/test/test_toDataURL.complexcolours.html
new file mode 100644
index 00000000000..5bf07d04e89
--- /dev/null
+++ b/mozilla/content/canvas/test/test_toDataURL.complexcolours.html
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML>
+<title>Canvas test: toDataURL.complexcolours</title>
+<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;
+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);
+}
+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');
+
+// (These values are chosen to survive relatively alright through being premultiplied)
+ctx.fillStyle = 'rgba(1, 3, 254, 1)';
+ctx.fillRect(0, 0, 25, 25);
+ctx.fillStyle = 'rgba(8, 252, 248, 0.75)';
+ctx.fillRect(25, 0, 25, 25);
+ctx.fillStyle = 'rgba(6, 10, 250, 0.502)';
+ctx.fillRect(50, 0, 25, 25);
+ctx.fillStyle = 'rgba(12, 16, 244, 0.25)';
+ctx.fillRect(75, 0, 25, 25);
+var img = new Image();
+deferTest();
+img.onload = wrapFunction(function ()
+{
+    ctx.drawImage(img, 0, 25);
+    // (The alpha values do not really survive float->int conversion, so just
+    // do approximate comparisons)
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalBrowserRead');
+    isPixel(ctx, 12,40, 1,3,254,255, "12,40", "1,3,254,255", 0);
+    isPixel(ctx, 37,40, 8,252,248,191, "37,40", "8,252,248,191", 2);
+    isPixel(ctx, 62,40, 6,10,250,127, "62,40", "6,10,250,127", 4);
+    isPixel(ctx, 87,40, 12,16,244,63, "87,40", "12,16,244,63", 8);
+});
+img.src = canvas.toDataURL();
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_toDataURL.default.html b/mozilla/content/canvas/test/test_toDataURL.default.html
new file mode 100644
index 00000000000..4141f08936f
--- /dev/null
+++ b/mozilla/content/canvas/test/test_toDataURL.default.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: toDataURL.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">
+<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 data = canvas.toDataURL();
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_toDataURL.nocontext.html b/mozilla/content/canvas/test/test_toDataURL.nocontext.html
new file mode 100644
index 00000000000..e0e919be31a
--- /dev/null
+++ b/mozilla/content/canvas/test/test_toDataURL.nocontext.html
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<title>Canvas test: toDataURL.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">
+<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 canvas2 = document.createElement('canvas');
+var data = canvas2.toDataURL();
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_toDataURL.png.html b/mozilla/content/canvas/test/test_toDataURL.png.html
new file mode 100644
index 00000000000..8a13c1fd8cc
--- /dev/null
+++ b/mozilla/content/canvas/test/test_toDataURL.png.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: toDataURL.png</title>
+<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 data = canvas.toDataURL('image/png');
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_toDataURL.primarycolours.html b/mozilla/content/canvas/test/test_toDataURL.primarycolours.html
new file mode 100644
index 00000000000..178db63331d
--- /dev/null
+++ b/mozilla/content/canvas/test/test_toDataURL.primarycolours.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML>
+<title>Canvas test: toDataURL.primarycolours</title>
+<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;
+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);
+}
+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');
+
+ctx.fillStyle = '#ff0';
+ctx.fillRect(0, 0, 25, 40);
+ctx.fillStyle = '#0ff';
+ctx.fillRect(25, 0, 50, 40);
+ctx.fillStyle = '#00f';
+ctx.fillRect(75, 0, 25, 40);
+ctx.fillStyle = '#fff';
+ctx.fillRect(0, 40, 100, 10);
+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);
+    isPixel(ctx, 50,20, 0,255,255,255, "50,20", "0,255,255,255", 0);
+    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();
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_type.delete.html b/mozilla/content/canvas/test/test_type.delete.html
new file mode 100644
index 00000000000..053ca2cd418
--- /dev/null
+++ b/mozilla/content/canvas/test/test_type.delete.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: type.delete</title>
+<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');
+
+delete window.HTMLCanvasElement;
+ok(window.HTMLCanvasElement, "window.HTMLCanvasElement");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_type.exists.html b/mozilla/content/canvas/test/test_type.exists.html
new file mode 100644
index 00000000000..6e03f2e286e
--- /dev/null
+++ b/mozilla/content/canvas/test/test_type.exists.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: type.exists</title>
+<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');
+
+ok(window.HTMLCanvasElement, "window.HTMLCanvasElement");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_type.extend.html b/mozilla/content/canvas/test/test_type.extend.html
new file mode 100644
index 00000000000..2da49f61848
--- /dev/null
+++ b/mozilla/content/canvas/test/test_type.extend.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: type.extend</title>
+<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');
+
+window.HTMLCanvasElement.prototype.getZero = function () { return 0; };
+ok(canvas.getZero() === 0, "canvas.getZero() === 0");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_type.name.html b/mozilla/content/canvas/test/test_type.name.html
new file mode 100644
index 00000000000..423152fd142
--- /dev/null
+++ b/mozilla/content/canvas/test/test_type.name.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<title>Canvas test: type.name</title>
+<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');
+
+ok(Object.prototype.toString.call(canvas) === '[object HTMLCanvasElement]', "Object.prototype.toString.call(canvas) === '[object HTMLCanvasElement]'");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_type.prototype.html b/mozilla/content/canvas/test/test_type.prototype.html
new file mode 100644
index 00000000000..395e8ca4865
--- /dev/null
+++ b/mozilla/content/canvas/test/test_type.prototype.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>Canvas test: type.prototype</title>
+<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');
+
+ok(window.HTMLCanvasElement.prototype, "window.HTMLCanvasElement.prototype");
+ok(window.HTMLCanvasElement.prototype.getContext, "window.HTMLCanvasElement.prototype.getContext");
+window.HTMLCanvasElement.prototype = null;
+ok(window.HTMLCanvasElement.prototype, "window.HTMLCanvasElement.prototype");
+delete window.HTMLCanvasElement.prototype;
+ok(window.HTMLCanvasElement.prototype, "window.HTMLCanvasElement.prototype");
+window.HTMLCanvasElement.prototype.getContext = 1;
+ok(window.HTMLCanvasElement.prototype.getContext === 1, "window.HTMLCanvasElement.prototype.getContext === 1");
+delete window.HTMLCanvasElement.prototype.getContext;
+todo(window.HTMLCanvasElement.prototype.getContext === undefined, "window.HTMLCanvasElement.prototype.getContext === undefined");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+
diff --git a/mozilla/content/canvas/test/test_type.replace.html b/mozilla/content/canvas/test/test_type.replace.html
new file mode 100644
index 00000000000..2714d0a4a5b
--- /dev/null
+++ b/mozilla/content/canvas/test/test_type.replace.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Canvas test: type.replace</title>
+<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');
+
+window.HTMLCanvasElement.prototype.getContext = function (name) { return 0; };
+ok(canvas.getContext('2d') === 0, "canvas.getContext('2d') === 0");
+
+if (!_deferred) SimpleTest.finish();
+});
+</script>
+