From e3c12a40d1aa27602f27997a4709fe45b332c466 Mon Sep 17 00:00:00 2001
From: Saint Wesonga <wesongathedeveloper@yahoo.com>
Date: Sat, 17 Oct 2009 18:19:26 -0700
Subject: [PATCH] Bug 467988 - delete unused test files after speeding up
 canvas mochitests, r=roc

---
 .../canvas/test/test_2d.canvas.readonly.html  |  27 --
 .../canvas/test/test_2d.canvas.reference.html |  23 --
 .../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 --
 .../test/test_2d.clearRect.negative.html      |  43 ---
 .../test/test_2d.clearRect.nonfinite.html     |  70 ----
 .../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/test_2d.composite.canvas.copy.html   |  45 ---
 ...t_2d.composite.canvas.destination-out.html |  45 ---
 ..._2d.composite.canvas.destination-over.html |  45 ---
 .../test_2d.composite.canvas.source-atop.html |  45 ---
 .../test_2d.composite.canvas.source-over.html |  45 ---
 .../test/test_2d.composite.clip.copy.html     |  44 ---
 ...st_2d.composite.clip.destination-atop.html |  44 ---
 ...test_2d.composite.clip.destination-in.html |  44 ---
 ...est_2d.composite.clip.destination-out.html |  44 ---
 ...st_2d.composite.clip.destination-over.html |  44 ---
 .../test_2d.composite.clip.source-atop.html   |  44 ---
 .../test_2d.composite.clip.source-in.html     |  44 ---
 .../test_2d.composite.clip.source-out.html    |  44 ---
 .../test_2d.composite.clip.source-over.html   |  44 ---
 .../test_2d.composite.globalAlpha.canvas.html |  45 ---
 ...d.composite.globalAlpha.canvaspattern.html |  58 ---
 ...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 |  52 ---
 ...test_2d.composite.globalAlpha.invalid.html |  35 --
 .../test_2d.composite.globalAlpha.range.html  |  31 --
 .../test/test_2d.composite.image.copy.html    |  40 --
 ...st_2d.composite.image.destination-out.html |  40 --
 ...t_2d.composite.image.destination-over.html |  40 --
 .../test_2d.composite.image.source-atop.html  |  40 --
 .../test_2d.composite.image.source-over.html  |  40 --
 ..._2d.composite.operation.casesensitive.html |  32 --
 .../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.highlight.html |  32 --
 ...est_2d.composite.operation.nullsuffix.html |  32 --
 .../test_2d.composite.operation.over.html     |  24 --
 ...t_2d.composite.operation.unrecognised.html |  32 --
 .../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_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 --
 ..._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.uncovered.fill.copy.html |  54 ---
 ...est_2d.composite.uncovered.image.copy.html |  54 ---
 ...t_2d.composite.uncovered.pattern.copy.html |  54 ---
 .../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 --
 .../test/test_2d.drawImage.animated.apng.html |  60 ---
 .../test/test_2d.drawImage.animated.gif.html  |  60 ---
 .../test_2d.drawImage.animated.poster.html    |  49 ---
 .../canvas/test/test_2d.drawImage.broken.html |  27 --
 .../canvas/test/test_2d.drawImage.canvas.html |  47 ---
 .../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  |  56 ---
 .../test_2d.drawImage.negativesource.html     |  56 ---
 .../test/test_2d.drawImage.nonfinite.html     | 348 ------------------
 .../canvas/test/test_2d.drawImage.nowrap.html |  41 ---
 .../canvas/test/test_2d.drawImage.null.html   |  24 --
 .../test/test_2d.drawImage.outsidesource.html |  83 -----
 .../canvas/test/test_2d.drawImage.path.html   |  39 --
 .../canvas/test/test_2d.drawImage.self.1.html |  43 ---
 .../canvas/test/test_2d.drawImage.self.2.html |  45 ---
 .../test/test_2d.drawImage.transform.html     |  39 --
 .../test/test_2d.drawImage.wrongtype.html     |  33 --
 .../test/test_2d.drawImage.zerosource.html    |  47 ---
 .../canvas/test/test_2d.fillRect.basic.html   |  36 --
 .../canvas/test/test_2d.fillRect.clip.html    |  47 ---
 .../test/test_2d.fillRect.negative.html       |  44 ---
 .../test/test_2d.fillRect.nonfinite.html      |  71 ----
 .../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    |  40 --
 .../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_2d.fillStyle.parse.current.basic.html |  51 ---
 ...st_2d.fillStyle.parse.current.changed.html |  52 ---
 ...st_2d.fillStyle.parse.current.removed.html |  63 ----
 .../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_2d.fillStyle.parse.hsl-clamp-1.html  |  38 --
 .../test_2d.fillStyle.parse.hsl-clamp-2.html  |  38 --
 .../test_2d.fillStyle.parse.hsl-clamp-3.html  |  38 --
 .../test_2d.fillStyle.parse.hsl-clamp-4.html  |  38 --
 .../test/test_2d.fillStyle.parse.hsla-1.html  |  38 --
 .../test/test_2d.fillStyle.parse.hsla-2.html  |  38 --
 .../test_2d.fillStyle.parse.hsla-clamp-1.html |  38 --
 .../test_2d.fillStyle.parse.hsla-clamp-2.html |  38 --
 .../test_2d.fillStyle.parse.hsla-clamp-3.html |  38 --
 .../test_2d.fillStyle.parse.hsla-clamp-4.html |  38 --
 .../test_2d.fillStyle.parse.hsla-clamp-5.html |  38 --
 .../test_2d.fillStyle.parse.hsla-clamp-6.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.hsl-5.html |  38 --
 ...est_2d.fillStyle.parse.invalid.hsla-1.html |  38 --
 ...est_2d.fillStyle.parse.invalid.hsla-2.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 --
 ...test_2d.fillStyle.parse.invalid.rgb-5.html |  38 --
 ...test_2d.fillStyle.parse.invalid.rgb-6.html |  38 --
 ...test_2d.fillStyle.parse.invalid.rgb-7.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_2d.fillStyle.parse.rgb-clamp-3.html  |  38 --
 .../test_2d.fillStyle.parse.rgb-clamp-4.html  |  38 --
 .../test_2d.fillStyle.parse.rgb-clamp-5.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       |  23 --
 .../test/test_2d.getcontext.shared.html       |  39 --
 .../test/test_2d.getcontext.unique.html       |  23 --
 .../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 |  54 ---
 .../test_2d.gradient.linear.nonfinite.html    |  91 -----
 .../test_2d.gradient.linear.transform.1.html  |  45 ---
 .../test_2d.gradient.linear.transform.2.html  |  46 ---
 .../test_2d.gradient.linear.transform.3.html  |  58 ---
 .../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  |  31 --
 .../test/test_2d.gradient.object.type.html    |  24 --
 .../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.shape1.html  |  60 ---
 .../test/test_2d.gradient.radial.inside1.html |  51 ---
 .../test_2d.gradient.radial.negative.html     |  31 --
 .../test_2d.gradient.radial.nonfinite.html    | 247 -------------
 .../test_2d.gradient.radial.transform.1.html  |  46 ---
 .../test_2d.gradient.radial.transform.2.html  |  47 ---
 .../test_2d.gradient.radial.transform.3.html  |  59 ---
 .../test/test_2d.imageData.create.basic.html  |  23 --
 .../test_2d.imageData.create.initial.html     |  31 --
 .../test/test_2d.imageData.create.large.html  |  33 --
 .../test_2d.imageData.create.negative.html    |  37 --
 .../test_2d.imageData.create.nonfinite.html   |  43 ---
 .../test/test_2d.imageData.create.round.html  |  28 --
 .../test/test_2d.imageData.create.tiny.html   |  39 --
 .../test/test_2d.imageData.create.type.html   |  37 --
 .../test/test_2d.imageData.create.zero.html   |  31 --
 .../test/test_2d.imageData.get.basic.html     |  23 --
 .../test/test_2d.imageData.get.clamp.html     |  34 --
 .../test/test_2d.imageData.get.nonfinite.html |  91 -----
 .../test/test_2d.imageData.get.nonpremul.html |  30 --
 .../test_2d.imageData.get.order.alpha.html    |  27 --
 .../test_2d.imageData.get.order.cols.html     |  30 --
 .../test/test_2d.imageData.get.order.rgb.html |  29 --
 .../test_2d.imageData.get.order.rows.html     |  30 --
 .../test/test_2d.imageData.get.range.html     |  30 --
 ...test_2d.imageData.get.source.negative.html |  50 ---
 .../test_2d.imageData.get.source.outside.html |  56 ---
 .../test_2d.imageData.get.source.size.html    |  26 --
 .../test/test_2d.imageData.get.tiny.html      |  34 --
 .../test/test_2d.imageData.get.type.html      |  37 --
 .../test_2d.imageData.get.unaffected.html     |  50 ---
 .../test/test_2d.imageData.get.zero.html      |  31 --
 .../test/test_2d.imageData.object.clamp.html  |  51 ---
 .../test/test_2d.imageData.object.ctor.html   |  26 --
 .../test/test_2d.imageData.object.nan.html    |  29 --
 .../test_2d.imageData.object.properties.html  |  26 --
 .../test_2d.imageData.object.readonly.html    |  36 --
 .../test/test_2d.imageData.object.round.html  |  45 ---
 .../test/test_2d.imageData.object.set.html    |  27 --
 .../test/test_2d.imageData.object.string.html |  32 --
 .../test_2d.imageData.object.undefined.html   |  26 --
 .../test/test_2d.imageData.put.alpha.html     |  41 ---
 .../test/test_2d.imageData.put.basic.html     |  41 ---
 .../test/test_2d.imageData.put.clip.html      |  57 ---
 .../test/test_2d.imageData.put.created.html   |  45 ---
 .../test/test_2d.imageData.put.cross.html     |  43 ---
 .../test_2d.imageData.put.dirty.negative.html |  60 ---
 .../test_2d.imageData.put.dirty.outside.html  |  62 ----
 .../test_2d.imageData.put.dirty.rect1.html    |  60 ---
 .../test_2d.imageData.put.dirty.rect2.html    |  60 ---
 .../test_2d.imageData.put.dirty.zero.html     |  53 ---
 .../test/test_2d.imageData.put.modified.html  |  46 ---
 .../test/test_2d.imageData.put.nonfinite.html | 269 --------------
 .../test/test_2d.imageData.put.null.html      |  25 --
 .../test/test_2d.imageData.put.path.html      |  42 ---
 .../test_2d.imageData.put.unaffected.html     |  46 ---
 .../test/test_2d.imageData.put.unchanged.html |  40 --
 .../test/test_2d.imageData.put.wrongtype.html |  32 --
 .../canvas/test/test_2d.imageSmoothing.html   |  65 ----
 .../test/test_2d.imagedata_coercion.html      | 110 ------
 .../canvas/test/test_2d.line.cap.butt.html    |  69 ----
 .../canvas/test/test_2d.line.cap.invalid.html |  56 ---
 .../canvas/test/test_2d.line.cap.open.html    |  54 ---
 .../canvas/test/test_2d.line.cap.round.html   |  85 -----
 .../canvas/test/test_2d.line.cap.square.html  |  69 ----
 content/canvas/test/test_2d.line.cross.html   |  50 ---
 .../canvas/test/test_2d.line.defaults.html    |  25 --
 .../canvas/test/test_2d.line.join.bevel.html  |  88 -----
 .../canvas/test/test_2d.line.join.closed.html |  53 ---
 .../test/test_2d.line.join.invalid.html       |  56 ---
 .../canvas/test/test_2d.line.join.miter.html  |  79 ----
 .../canvas/test/test_2d.line.join.open.html   |  53 ---
 .../canvas/test/test_2d.line.join.round.html  |  86 -----
 .../canvas/test/test_2d.line.miter.acute.html |  60 ---
 .../test/test_2d.line.miter.exceeded.html     |  52 ---
 .../test/test_2d.line.miter.invalid.html      |  52 ---
 .../test/test_2d.line.miter.lineedge.html     |  49 ---
 .../test/test_2d.line.miter.obtuse.html       |  62 ----
 .../test/test_2d.line.miter.rightangle.html   |  52 ---
 .../test/test_2d.line.miter.within.html       |  52 ---
 content/canvas/test/test_2d.line.union.html   |  53 ---
 .../canvas/test/test_2d.line.width.basic.html |  71 ----
 .../test/test_2d.line.width.invalid.html      |  52 ---
 .../test/test_2d.line.width.transformed.html  |  77 ----
 content/canvas/test/test_2d.missingargs.html  | 294 ---------------
 .../canvas/test/test_2d.path.arc.angle.1.html |  42 ---
 .../canvas/test/test_2d.path.arc.angle.2.html |  42 ---
 .../canvas/test/test_2d.path.arc.angle.3.html |  42 ---
 .../canvas/test/test_2d.path.arc.angle.4.html |  45 ---
 .../canvas/test/test_2d.path.arc.angle.5.html |  42 ---
 .../canvas/test/test_2d.path.arc.angle.6.html |  45 ---
 .../canvas/test/test_2d.path.arc.empty.html   |  42 ---
 content/canvas/test/test_2d.path.arc.end.html |  44 ---
 .../test/test_2d.path.arc.negative.html       |  25 --
 .../test/test_2d.path.arc.nonempty.html       |  43 ---
 .../test/test_2d.path.arc.nonfinite.html      |  75 ----
 .../canvas/test/test_2d.path.arc.scale.1.html |  62 ----
 .../canvas/test/test_2d.path.arc.scale.2.html |  52 ---
 .../test_2d.path.arc.selfintersect.1.html     |  45 ---
 .../test_2d.path.arc.selfintersect.2.html     |  50 ---
 .../canvas/test/test_2d.path.arc.shape.1.html |  47 ---
 .../canvas/test/test_2d.path.arc.shape.2.html |  47 ---
 .../canvas/test/test_2d.path.arc.shape.4.html |  46 ---
 .../canvas/test/test_2d.path.arc.shape.5.html |  46 ---
 .../test/test_2d.path.arc.twopie.1.html       |  42 ---
 .../test/test_2d.path.arc.twopie.2.html       |  42 ---
 .../test/test_2d.path.arc.twopie.3.html       |  42 ---
 .../test/test_2d.path.arc.twopie.4.html       |  42 ---
 .../canvas/test/test_2d.path.arc.zero.1.html  |  42 ---
 .../canvas/test/test_2d.path.arc.zero.2.html  |  42 ---
 .../test/test_2d.path.arc.zeroradius.html     |  55 ---
 .../test/test_2d.path.arcTo.coincide.1.html   |  66 ----
 .../test/test_2d.path.arcTo.coincide.2.html   |  44 ---
 .../test/test_2d.path.arcTo.collinear.1.html  |  63 ----
 .../test/test_2d.path.arcTo.collinear.2.html  |  63 ----
 .../test/test_2d.path.arcTo.collinear.3.html  |  63 ----
 .../test/test_2d.path.arcTo.emptysubpath.html |  55 ---
 .../test/test_2d.path.arcTo.negative.html     |  25 --
 .../test/test_2d.path.arcTo.nonfinite.html    |  91 -----
 .../canvas/test/test_2d.path.arcTo.scale.html |  55 ---
 .../test/test_2d.path.arcTo.shape.curve1.html |  79 ----
 .../test/test_2d.path.arcTo.shape.curve2.html |  79 ----
 .../test/test_2d.path.arcTo.shape.end.html    |  60 ---
 .../test/test_2d.path.arcTo.shape.start.html  |  60 ---
 .../test_2d.path.arcTo.transformation.html    |  54 ---
 .../test/test_2d.path.arcTo.zero.1.html       |  59 ---
 .../test/test_2d.path.arcTo.zero.2.html       |  59 ---
 .../canvas/test/test_2d.path.beginPath.html   |  38 --
 .../test_2d.path.bezierCurveTo.basic.html     |  40 --
 ...st_2d.path.bezierCurveTo.emptysubpath.html |  52 ---
 .../test_2d.path.bezierCurveTo.nonfinite.html | 125 -------
 .../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.overlap.html       |  43 ---
 .../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 ---
 content/canvas/test/test_2d.path.initial.html |  53 ---
 .../test/test_2d.path.isPointInPath.arc.html  |  31 --
 .../test_2d.path.isPointInPath.basic.1.html   |  25 --
 .../test_2d.path.isPointInPath.basic.2.html   |  25 --
 .../test_2d.path.isPointInPath.bezier.html    |  44 ---
 .../test_2d.path.isPointInPath.bigarc.html    |  31 --
 .../test/test_2d.path.isPointInPath.edge.html |  35 --
 .../test_2d.path.isPointInPath.empty.html     |  23 --
 .../test_2d.path.isPointInPath.nonfinite.html |  38 --
 .../test_2d.path.isPointInPath.outside.html   |  30 --
 .../test_2d.path.isPointInPath.subpath.html   |  30 --
 ...est_2d.path.isPointInPath.transform.1.html |  30 --
 ...est_2d.path.isPointInPath.transform.2.html |  30 --
 ...est_2d.path.isPointInPath.transform.3.html |  30 --
 .../test_2d.path.isPointInPath.unclosed.html  |  28 --
 .../test_2d.path.isPointInPath.winding.html   |  43 ---
 .../test/test_2d.path.lineTo.basic.html       |  40 --
 .../test_2d.path.lineTo.emptysubpath.html     |  52 ---
 .../test/test_2d.path.lineTo.nextpoint.html   |  41 ---
 .../test/test_2d.path.lineTo.nonfinite.html   |  57 ---
 .../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/test_2d.path.moveTo.nonfinite.html   |  56 ---
 .../test_2d.path.quadraticCurveTo.basic.html  |  40 --
 ...2d.path.quadraticCurveTo.emptysubpath.html |  52 ---
 ...st_2d.path.quadraticCurveTo.nonfinite.html |  73 ----
 .../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      |  46 ---
 .../test/test_2d.path.rect.newsubpath.html    |  41 ---
 .../test/test_2d.path.rect.nonfinite.html     |  73 ----
 .../test/test_2d.path.rect.winding.html       |  46 ---
 .../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 --
 .../test/test_2d.path.stroke.empty.html       |  48 ---
 .../test/test_2d.path.stroke.overlap.html     |  46 ---
 .../test/test_2d.path.stroke.prune.arc.html   |  65 ----
 .../test_2d.path.stroke.prune.closed.html     |  61 ---
 .../test_2d.path.stroke.prune.corner.html     |  51 ---
 .../test/test_2d.path.stroke.prune.curve.html |  65 ----
 .../test/test_2d.path.stroke.prune.line.html  |  60 ---
 .../test/test_2d.path.stroke.prune.rect.html  |  61 ---
 .../test/test_2d.path.stroke.scale1.html      |  62 ----
 .../test/test_2d.path.stroke.scale2.html      |  64 ----
 .../canvas/test/test_2d.path.stroke.skew.html |  78 ----
 .../test/test_2d.path.stroke.unaffected.html  |  50 ---
 .../test/test_2d.path.stroke.union.html       |  46 ---
 .../test_2d.path.transformation.basic.html    |  43 ---
 .../test_2d.path.transformation.changing.html |  50 ---
 .../test_2d.path.transformation.multiple.html |  43 ---
 .../test/test_2d.pattern.animated.gif.html    |  66 ----
 .../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      |  29 --
 .../test_2d.pattern.basic.zerocanvas.html     |  65 ----
 .../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   |  56 ---
 .../test/test_2d.pattern.modify.image2.html   |  60 ---
 .../test_2d.pattern.paint.norepeat.basic.html |  46 ---
 ...test_2d.pattern.paint.norepeat.coord1.html |  49 ---
 ...test_2d.pattern.paint.norepeat.coord2.html |  50 ---
 ...test_2d.pattern.paint.norepeat.coord3.html |  50 ---
 ...est_2d.pattern.paint.norepeat.outside.html |  52 ---
 ...t_2d.pattern.paint.orientation.canvas.html |  56 ---
 ...st_2d.pattern.paint.orientation.image.html |  53 ---
 .../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  |  58 ---
 .../test_2d.pattern.paint.repeat.outside.html |  47 ---
 .../test_2d.pattern.paint.repeatx.basic.html  |  48 ---
 .../test_2d.pattern.paint.repeatx.coord1.html |  64 ----
 ...test_2d.pattern.paint.repeatx.outside.html |  61 ---
 .../test_2d.pattern.paint.repeaty.basic.html  |  48 ---
 .../test_2d.pattern.paint.repeaty.coord1.html |  64 ----
 ...test_2d.pattern.paint.repeaty.outside.html |  61 ---
 .../test/test_2d.pattern.repeat.case.html     |  24 --
 .../test/test_2d.pattern.repeat.empty.html    |  45 ---
 .../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 --
 content/canvas/test/test_2d.scaled.html       |  27 --
 .../canvas/test/test_2d.shadow.alpha.1.html   |  40 --
 .../canvas/test/test_2d.shadow.alpha.2.html   |  52 ---
 .../canvas/test/test_2d.shadow.alpha.3.html   |  54 ---
 .../canvas/test/test_2d.shadow.alpha.4.html   |  54 ---
 .../canvas/test/test_2d.shadow.alpha.5.html   |  53 ---
 ...est_2d.shadow.attributes.shadowBlur.1.html |  32 --
 ...est_2d.shadow.attributes.shadowBlur.2.html |  30 --
 ...st_2d.shadow.attributes.shadowColor.1.html |  25 --
 ...st_2d.shadow.attributes.shadowColor.2.html |  28 --
 ...t_2d.shadow.attributes.shadowOffset.1.html |  37 --
 ...t_2d.shadow.attributes.shadowOffset.2.html |  39 --
 .../canvas/test/test_2d.shadow.basic.1.html   |  37 --
 .../canvas/test/test_2d.shadow.basic.2.html   |  39 --
 .../canvas/test/test_2d.shadow.blur.high.html |  28 --
 .../canvas/test/test_2d.shadow.blur.low.html  |  34 --
 .../test/test_2d.shadow.canvas.alpha.html     |  60 ---
 .../test/test_2d.shadow.canvas.basic.html     |  59 ---
 .../test_2d.shadow.canvas.transparent.1.html  |  45 ---
 .../test_2d.shadow.canvas.transparent.2.html  |  65 ----
 .../canvas/test/test_2d.shadow.clip.1.html    |  61 ---
 .../canvas/test/test_2d.shadow.clip.2.html    |  49 ---
 .../canvas/test/test_2d.shadow.clip.3.html    |  62 ----
 .../test/test_2d.shadow.composite.1.html      |  54 ---
 .../test/test_2d.shadow.composite.2.html      |  54 ---
 .../test/test_2d.shadow.composite.3.html      |  53 ---
 .../test/test_2d.shadow.composite.4.html      |  51 ---
 .../test/test_2d.shadow.gradient.alpha.html   |  56 ---
 .../test/test_2d.shadow.gradient.basic.html   |  56 ---
 ...test_2d.shadow.gradient.transparent.1.html |  44 ---
 ...test_2d.shadow.gradient.transparent.2.html |  62 ----
 .../test/test_2d.shadow.image.alpha.html      |  53 ---
 .../test/test_2d.shadow.image.basic.html      |  53 ---
 .../test/test_2d.shadow.image.scale.html      |  55 ---
 .../test/test_2d.shadow.image.section.html    |  43 ---
 .../test_2d.shadow.image.transparent.1.html   |  41 ---
 .../test_2d.shadow.image.transparent.2.html   |  59 ---
 .../test/test_2d.shadow.offset.negativeX.html |  53 ---
 .../test/test_2d.shadow.offset.negativeY.html |  53 ---
 .../test/test_2d.shadow.offset.positiveX.html |  53 ---
 .../test/test_2d.shadow.offset.positiveY.html |  53 ---
 .../canvas/test/test_2d.shadow.outside.html   |  61 ---
 .../test/test_2d.shadow.pattern.alpha.html    |  55 ---
 .../test/test_2d.shadow.pattern.basic.html    |  55 ---
 .../test_2d.shadow.pattern.transparent.1.html |  43 ---
 .../test_2d.shadow.pattern.transparent.2.html |  59 ---
 .../test/test_2d.shadow.stroke.basic.html     |  59 ---
 .../test/test_2d.shadow.stroke.cap.1.html     |  50 ---
 .../test/test_2d.shadow.stroke.cap.2.html     |  60 ---
 .../test/test_2d.shadow.stroke.join.1.html    |  50 ---
 .../test/test_2d.shadow.stroke.join.2.html    |  64 ----
 .../test/test_2d.shadow.stroke.join.3.html    |  51 ---
 .../test/test_2d.shadow.transform.1.html      |  53 ---
 .../test/test_2d.shadow.transform.2.html      |  53 ---
 .../test_2d.state.saverestore.bitmap.html     |  41 ---
 .../test/test_2d.state.saverestore.clip.html  |  43 ---
 .../test_2d.state.saverestore.fillStyle.html  |  37 --
 ...test_2d.state.saverestore.globalAlpha.html |  37 --
 ....saverestore.globalCompositeOperation.html |  37 --
 .../test_2d.state.saverestore.lineCap.html    |  37 --
 .../test_2d.state.saverestore.lineJoin.html   |  37 --
 .../test_2d.state.saverestore.lineWidth.html  |  37 --
 .../test_2d.state.saverestore.miterLimit.html |  37 --
 .../test/test_2d.state.saverestore.path.html  |  42 ---
 .../test_2d.state.saverestore.shadowBlur.html |  37 --
 ...test_2d.state.saverestore.shadowColor.html |  37 --
 ...st_2d.state.saverestore.shadowOffsetX.html |  37 --
 ...st_2d.state.saverestore.shadowOffsetY.html |  37 --
 .../test/test_2d.state.saverestore.stack.html |  32 --
 .../test_2d.state.saverestore.stackdepth.html |  33 --
 ...test_2d.state.saverestore.strokeStyle.html |  37 --
 ...t_2d.state.saverestore.transformation.html |  42 ---
 .../test_2d.state.saverestore.underflow.html  |  27 --
 .../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     |  45 ---
 .../test/test_2d.strokeRect.nonfinite.html    |  72 ----
 .../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       |  51 ---
 .../test/test_2d.strokeRect.zero.3.html       |  37 --
 .../test/test_2d.strokeRect.zero.4.html       |  38 --
 .../test/test_2d.strokeStyle.default.html     |  22 --
 .../test/test_2d.transformation.order.html    |  42 ---
 ...st_2d.transformation.rotate.direction.html |  41 ---
 ...st_2d.transformation.rotate.nonfinite.html |  54 ---
 ...test_2d.transformation.rotate.radians.html |  41 ---
 .../test_2d.transformation.rotate.wrap.html   |  46 ---
 ...2d.transformation.rotate.wrapnegative.html |  43 ---
 .../test_2d.transformation.rotate.zero.html   |  41 ---
 .../test_2d.transformation.scale.basic.html   |  41 ---
 .../test_2d.transformation.scale.large.html   |  41 ---
 ...test_2d.transformation.scale.multiple.html |  42 ---
 ...test_2d.transformation.scale.negative.html |  50 ---
 ...est_2d.transformation.scale.nonfinite.html |  58 ---
 .../test_2d.transformation.scale.zero.html    |  51 ---
 ....transformation.setTransform.multiple.html |  41 ---
 ...transformation.setTransform.nonfinite.html | 126 -------
 ...2d.transformation.setTransform.skewed.html |  62 ----
 ..._2d.transformation.transform.identity.html |  41 ---
 ..._2d.transformation.transform.multiply.html |  42 ---
 ...2d.transformation.transform.nonfinite.html | 126 -------
 ...st_2d.transformation.transform.skewed.html |  63 ----
 ...est_2d.transformation.translate.basic.html |  41 ---
 ...2d.transformation.translate.nonfinite.html |  58 ---
 content/canvas/test/test_2d.type.delete.html  |  24 --
 content/canvas/test/test_2d.type.exists.html  |  23 --
 content/canvas/test/test_2d.type.extend.html  |  42 ---
 .../canvas/test/test_2d.type.prototype.html   |  32 --
 content/canvas/test/test_2d.type.replace.html |  43 ---
 content/canvas/test/test_2d.voidreturn.html   |  55 ---
 content/canvas/test/test_bug397524.html       |  71 ----
 content/canvas/test/test_bug405982.html       |  34 --
 .../test/test_context.arguments.extra.html    |  22 --
 .../test/test_context.arguments.missing.html  |  24 --
 .../test/test_context.casesensitive.html      |  31 --
 .../canvas/test/test_context.emptystring.html |  31 --
 .../test_context.unrecognised.badname.html    |  31 --
 .../test_context.unrecognised.badsuffix.html  |  31 --
 .../test_context.unrecognised.nullsuffix.html |  31 --
 .../test_context.unrecognised.unicode.html    |  31 --
 content/canvas/test/test_fallback.basic.html  |  23 --
 .../canvas/test/test_fallback.multiple.html   |  23 --
 content/canvas/test/test_fallback.nested.html |  23 --
 content/canvas/test/test_initial.colour.html  |  35 --
 .../test/test_initial.reset.2dstate.html      |  84 -----
 .../canvas/test/test_initial.reset.clip.html  |  41 ---
 .../test/test_initial.reset.different.html    |  39 --
 .../test/test_initial.reset.gradient.html     |  44 ---
 .../canvas/test/test_initial.reset.path.html  |  40 --
 .../test/test_initial.reset.pattern.html      |  44 ---
 .../canvas/test/test_initial.reset.same.html  |  40 --
 .../test/test_initial.reset.transform.html    |  40 --
 .../test/test_size.attributes.default.html    |  26 --
 content/canvas/test/test_size.attributes.html |  26 --
 .../test_size.attributes.parse.badsuffix.html |  23 --
 ...est_size.attributes.parse.floatsuffix.html |  23 --
 .../test_size.attributes.parse.negative.html  |  23 --
 .../test_size.attributes.parse.nonnumber.html |  23 --
 ...t_size.attributes.parse.percentsuffix.html |  23 --
 ...test_size.attributes.parse.whitespace.html |  23 --
 .../test/test_size.attributes.parse.zero.html |  23 --
 ...test_size.attributes.parse.zerosuffix.html |  23 --
 .../test/test_size.attributes.reflect.1.html  |  28 --
 .../test/test_size.attributes.reflect.2.html  |  28 --
 .../test/test_size.attributes.removed.html    |  24 --
 ...ize.attributes.setAttribute.badsuffix.html |  24 --
 ...e.attributes.setAttribute.floatsuffix.html |  25 --
 ...size.attributes.setAttribute.negative.html |  24 --
 ...ize.attributes.setAttribute.nonnumber.html |  24 --
 ...attributes.setAttribute.percentsuffix.html |  24 --
 ...ze.attributes.setAttribute.whitespace.html |  24 --
 ...est_size.attributes.setAttribute.zero.html |  24 --
 ...ze.attributes.setAttribute.zerosuffix.html |  25 --
 .../test/test_size.attributes.style.html      |  24 --
 .../test/test_size.attributes.type.get.html   |  26 --
 .../test/test_size.attributes.type.set.html   |  26 --
 content/canvas/test/test_text.font.html       |  29 --
 content/canvas/test/test_text.measure.html    |  39 --
 .../canvas/test/test_text.space.replace.html  |  30 --
 content/canvas/test/test_text.textAlign.html  |  57 ---
 .../canvas/test/test_text.textBaseline.html   |  64 ----
 .../test/test_toDataURL.arguments.1.html      |  32 --
 .../test/test_toDataURL.arguments.2.html      |  32 --
 .../test/test_toDataURL.arguments.3.html      |  33 --
 .../test/test_toDataURL.complexcolours.html   |  65 ----
 .../canvas/test/test_toDataURL.default.html   |  24 --
 .../canvas/test/test_toDataURL.lowercase.html |  32 --
 .../canvas/test/test_toDataURL.nocontext.html |  25 --
 content/canvas/test/test_toDataURL.png.html   |  24 --
 .../test/test_toDataURL.primarycolours.html   |  65 ----
 .../test/test_toDataURL.unrecognised.html     |  32 --
 .../canvas/test/test_toDataURL.zerosize.html  |  24 --
 content/canvas/test/test_type.delete.html     |  24 --
 content/canvas/test/test_type.exists.html     |  23 --
 content/canvas/test/test_type.extend.html     |  24 --
 content/canvas/test/test_type.name.html       |  23 --
 content/canvas/test/test_type.prototype.html  |  32 --
 content/canvas/test/test_type.replace.html    |  24 --
 633 files changed, 28421 deletions(-)
 delete mode 100644 content/canvas/test/test_2d.canvas.readonly.html
 delete mode 100644 content/canvas/test/test_2d.canvas.reference.html
 delete mode 100644 content/canvas/test/test_2d.clearRect.basic.html
 delete mode 100644 content/canvas/test/test_2d.clearRect.clip.html
 delete mode 100644 content/canvas/test/test_2d.clearRect.globalalpha.html
 delete mode 100644 content/canvas/test/test_2d.clearRect.globalcomposite.html
 delete mode 100644 content/canvas/test/test_2d.clearRect.negative.html
 delete mode 100644 content/canvas/test/test_2d.clearRect.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.clearRect.path.html
 delete mode 100644 content/canvas/test/test_2d.clearRect.shadow.html
 delete mode 100644 content/canvas/test/test_2d.clearRect.transform.html
 delete mode 100644 content/canvas/test/test_2d.clearRect.zero.html
 delete mode 100644 content/canvas/test/test_2d.composite.canvas.copy.html
 delete mode 100644 content/canvas/test/test_2d.composite.canvas.destination-out.html
 delete mode 100644 content/canvas/test/test_2d.composite.canvas.destination-over.html
 delete mode 100644 content/canvas/test/test_2d.composite.canvas.source-atop.html
 delete mode 100644 content/canvas/test/test_2d.composite.canvas.source-over.html
 delete mode 100644 content/canvas/test/test_2d.composite.clip.copy.html
 delete mode 100644 content/canvas/test/test_2d.composite.clip.destination-atop.html
 delete mode 100644 content/canvas/test/test_2d.composite.clip.destination-in.html
 delete mode 100644 content/canvas/test/test_2d.composite.clip.destination-out.html
 delete mode 100644 content/canvas/test/test_2d.composite.clip.destination-over.html
 delete mode 100644 content/canvas/test/test_2d.composite.clip.source-atop.html
 delete mode 100644 content/canvas/test/test_2d.composite.clip.source-in.html
 delete mode 100644 content/canvas/test/test_2d.composite.clip.source-out.html
 delete mode 100644 content/canvas/test/test_2d.composite.clip.source-over.html
 delete mode 100644 content/canvas/test/test_2d.composite.globalAlpha.canvas.html
 delete mode 100644 content/canvas/test/test_2d.composite.globalAlpha.canvaspattern.html
 delete mode 100644 content/canvas/test/test_2d.composite.globalAlpha.default.html
 delete mode 100644 content/canvas/test/test_2d.composite.globalAlpha.fill.html
 delete mode 100644 content/canvas/test/test_2d.composite.globalAlpha.image.html
 delete mode 100644 content/canvas/test/test_2d.composite.globalAlpha.imagepattern.html
 delete mode 100644 content/canvas/test/test_2d.composite.globalAlpha.invalid.html
 delete mode 100644 content/canvas/test/test_2d.composite.globalAlpha.range.html
 delete mode 100644 content/canvas/test/test_2d.composite.image.copy.html
 delete mode 100644 content/canvas/test/test_2d.composite.image.destination-out.html
 delete mode 100644 content/canvas/test/test_2d.composite.image.destination-over.html
 delete mode 100644 content/canvas/test/test_2d.composite.image.source-atop.html
 delete mode 100644 content/canvas/test/test_2d.composite.image.source-over.html
 delete mode 100644 content/canvas/test/test_2d.composite.operation.casesensitive.html
 delete mode 100644 content/canvas/test/test_2d.composite.operation.clear.html
 delete mode 100644 content/canvas/test/test_2d.composite.operation.darker.html
 delete mode 100644 content/canvas/test/test_2d.composite.operation.default.html
 delete mode 100644 content/canvas/test/test_2d.composite.operation.get.html
 delete mode 100644 content/canvas/test/test_2d.composite.operation.highlight.html
 delete mode 100644 content/canvas/test/test_2d.composite.operation.nullsuffix.html
 delete mode 100644 content/canvas/test/test_2d.composite.operation.over.html
 delete mode 100644 content/canvas/test/test_2d.composite.operation.unrecognised.html
 delete mode 100644 content/canvas/test/test_2d.composite.solid.copy.html
 delete mode 100644 content/canvas/test/test_2d.composite.solid.destination-atop.html
 delete mode 100644 content/canvas/test/test_2d.composite.solid.destination-in.html
 delete mode 100644 content/canvas/test/test_2d.composite.solid.destination-out.html
 delete mode 100644 content/canvas/test/test_2d.composite.solid.destination-over.html
 delete mode 100644 content/canvas/test/test_2d.composite.solid.source-atop.html
 delete mode 100644 content/canvas/test/test_2d.composite.solid.source-in.html
 delete mode 100644 content/canvas/test/test_2d.composite.solid.source-out.html
 delete mode 100644 content/canvas/test/test_2d.composite.solid.source-over.html
 delete mode 100644 content/canvas/test/test_2d.composite.transparent.copy.html
 delete mode 100644 content/canvas/test/test_2d.composite.transparent.destination-atop.html
 delete mode 100644 content/canvas/test/test_2d.composite.transparent.destination-in.html
 delete mode 100644 content/canvas/test/test_2d.composite.transparent.destination-out.html
 delete mode 100644 content/canvas/test/test_2d.composite.transparent.destination-over.html
 delete mode 100644 content/canvas/test/test_2d.composite.transparent.source-atop.html
 delete mode 100644 content/canvas/test/test_2d.composite.transparent.source-in.html
 delete mode 100644 content/canvas/test/test_2d.composite.transparent.source-out.html
 delete mode 100644 content/canvas/test/test_2d.composite.transparent.source-over.html
 delete mode 100644 content/canvas/test/test_2d.composite.uncovered.fill.copy.html
 delete mode 100644 content/canvas/test/test_2d.composite.uncovered.image.copy.html
 delete mode 100644 content/canvas/test/test_2d.composite.uncovered.pattern.copy.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.3arg.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.5arg.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.9arg.basic.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.9arg.destpos.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.9arg.destsize.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.9arg.sourcepos.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.9arg.sourcesize.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.alpha.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.animated.apng.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.animated.gif.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.animated.poster.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.broken.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.canvas.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.clip.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.composite.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.floatsource.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.incomplete.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.negativedest.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.negativesource.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.nowrap.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.null.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.outsidesource.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.path.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.self.1.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.self.2.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.transform.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.wrongtype.html
 delete mode 100644 content/canvas/test/test_2d.drawImage.zerosource.html
 delete mode 100644 content/canvas/test/test_2d.fillRect.basic.html
 delete mode 100644 content/canvas/test/test_2d.fillRect.clip.html
 delete mode 100644 content/canvas/test/test_2d.fillRect.negative.html
 delete mode 100644 content/canvas/test/test_2d.fillRect.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.fillRect.path.html
 delete mode 100644 content/canvas/test/test_2d.fillRect.shadow.html
 delete mode 100644 content/canvas/test/test_2d.fillRect.transform.html
 delete mode 100644 content/canvas/test/test_2d.fillRect.zero.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.default.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.get.semitransparent.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.get.solid.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.get.transparent.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.invalidstring.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.invalidtype.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.current.basic.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.current.changed.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.current.removed.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hex3.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hex6.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsl-1.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsl-2.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsl-3.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsl-4.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsl-5.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-1.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-2.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-3.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-4.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsla-1.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsla-2.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-1.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-2.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-3.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-4.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-5.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-6.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.html4.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.hex3.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.hex6.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-1.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-2.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-3.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-4.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-5.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.hsla-1.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.hsla-2.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-1.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-2.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-3.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-4.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-5.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-6.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-7.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-1.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-2.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-3.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-4.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-5.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-1.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-2.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-3.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-4.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-5.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.rgb-num.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.rgb-percent.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-1.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-2.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.rgba-num-1.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.rgba-num-2.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.rgba-percent.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.rgba-solid-1.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.rgba-solid-2.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.svg-1.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.svg-2.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.system.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.transparent-1.html
 delete mode 100644 content/canvas/test/test_2d.fillStyle.parse.transparent-2.html
 delete mode 100644 content/canvas/test/test_2d.getcontext.exists.html
 delete mode 100644 content/canvas/test/test_2d.getcontext.shared.html
 delete mode 100644 content/canvas/test/test_2d.getcontext.unique.html
 delete mode 100644 content/canvas/test/test_2d.gradient.empty.html
 delete mode 100644 content/canvas/test/test_2d.gradient.interpolate.alpha.html
 delete mode 100644 content/canvas/test/test_2d.gradient.interpolate.colour.html
 delete mode 100644 content/canvas/test/test_2d.gradient.interpolate.colouralpha.html
 delete mode 100644 content/canvas/test/test_2d.gradient.interpolate.multiple.html
 delete mode 100644 content/canvas/test/test_2d.gradient.interpolate.outside.html
 delete mode 100644 content/canvas/test/test_2d.gradient.interpolate.overlap.html
 delete mode 100644 content/canvas/test/test_2d.gradient.interpolate.overlap2.html
 delete mode 100644 content/canvas/test/test_2d.gradient.interpolate.solid.html
 delete mode 100644 content/canvas/test/test_2d.gradient.interpolate.vertical.html
 delete mode 100644 content/canvas/test/test_2d.gradient.interpolate.zerosize.html
 delete mode 100644 content/canvas/test/test_2d.gradient.linear.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.gradient.linear.transform.1.html
 delete mode 100644 content/canvas/test/test_2d.gradient.linear.transform.2.html
 delete mode 100644 content/canvas/test/test_2d.gradient.linear.transform.3.html
 delete mode 100644 content/canvas/test/test_2d.gradient.object.compare.html
 delete mode 100644 content/canvas/test/test_2d.gradient.object.crosscanvas.html
 delete mode 100644 content/canvas/test/test_2d.gradient.object.invalidcolour.html
 delete mode 100644 content/canvas/test/test_2d.gradient.object.invalidoffset.html
 delete mode 100644 content/canvas/test/test_2d.gradient.object.return.html
 delete mode 100644 content/canvas/test/test_2d.gradient.object.type.html
 delete mode 100644 content/canvas/test/test_2d.gradient.object.update.html
 delete mode 100644 content/canvas/test/test_2d.gradient.radial.cone.bottom.html
 delete mode 100644 content/canvas/test/test_2d.gradient.radial.cone.cylinder.html
 delete mode 100644 content/canvas/test/test_2d.gradient.radial.cone.shape1.html
 delete mode 100644 content/canvas/test/test_2d.gradient.radial.inside1.html
 delete mode 100644 content/canvas/test/test_2d.gradient.radial.negative.html
 delete mode 100644 content/canvas/test/test_2d.gradient.radial.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.gradient.radial.transform.1.html
 delete mode 100644 content/canvas/test/test_2d.gradient.radial.transform.2.html
 delete mode 100644 content/canvas/test/test_2d.gradient.radial.transform.3.html
 delete mode 100644 content/canvas/test/test_2d.imageData.create.basic.html
 delete mode 100644 content/canvas/test/test_2d.imageData.create.initial.html
 delete mode 100644 content/canvas/test/test_2d.imageData.create.large.html
 delete mode 100644 content/canvas/test/test_2d.imageData.create.negative.html
 delete mode 100644 content/canvas/test/test_2d.imageData.create.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.imageData.create.round.html
 delete mode 100644 content/canvas/test/test_2d.imageData.create.tiny.html
 delete mode 100644 content/canvas/test/test_2d.imageData.create.type.html
 delete mode 100644 content/canvas/test/test_2d.imageData.create.zero.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.basic.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.clamp.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.nonpremul.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.order.alpha.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.order.cols.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.order.rgb.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.order.rows.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.range.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.source.negative.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.source.outside.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.source.size.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.tiny.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.type.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.unaffected.html
 delete mode 100644 content/canvas/test/test_2d.imageData.get.zero.html
 delete mode 100644 content/canvas/test/test_2d.imageData.object.clamp.html
 delete mode 100644 content/canvas/test/test_2d.imageData.object.ctor.html
 delete mode 100644 content/canvas/test/test_2d.imageData.object.nan.html
 delete mode 100644 content/canvas/test/test_2d.imageData.object.properties.html
 delete mode 100644 content/canvas/test/test_2d.imageData.object.readonly.html
 delete mode 100644 content/canvas/test/test_2d.imageData.object.round.html
 delete mode 100644 content/canvas/test/test_2d.imageData.object.set.html
 delete mode 100644 content/canvas/test/test_2d.imageData.object.string.html
 delete mode 100644 content/canvas/test/test_2d.imageData.object.undefined.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.alpha.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.basic.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.clip.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.created.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.cross.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.dirty.negative.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.dirty.outside.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.dirty.rect1.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.dirty.rect2.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.dirty.zero.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.modified.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.null.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.path.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.unaffected.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.unchanged.html
 delete mode 100644 content/canvas/test/test_2d.imageData.put.wrongtype.html
 delete mode 100644 content/canvas/test/test_2d.imageSmoothing.html
 delete mode 100644 content/canvas/test/test_2d.imagedata_coercion.html
 delete mode 100644 content/canvas/test/test_2d.line.cap.butt.html
 delete mode 100644 content/canvas/test/test_2d.line.cap.invalid.html
 delete mode 100644 content/canvas/test/test_2d.line.cap.open.html
 delete mode 100644 content/canvas/test/test_2d.line.cap.round.html
 delete mode 100644 content/canvas/test/test_2d.line.cap.square.html
 delete mode 100644 content/canvas/test/test_2d.line.cross.html
 delete mode 100644 content/canvas/test/test_2d.line.defaults.html
 delete mode 100644 content/canvas/test/test_2d.line.join.bevel.html
 delete mode 100644 content/canvas/test/test_2d.line.join.closed.html
 delete mode 100644 content/canvas/test/test_2d.line.join.invalid.html
 delete mode 100644 content/canvas/test/test_2d.line.join.miter.html
 delete mode 100644 content/canvas/test/test_2d.line.join.open.html
 delete mode 100644 content/canvas/test/test_2d.line.join.round.html
 delete mode 100644 content/canvas/test/test_2d.line.miter.acute.html
 delete mode 100644 content/canvas/test/test_2d.line.miter.exceeded.html
 delete mode 100644 content/canvas/test/test_2d.line.miter.invalid.html
 delete mode 100644 content/canvas/test/test_2d.line.miter.lineedge.html
 delete mode 100644 content/canvas/test/test_2d.line.miter.obtuse.html
 delete mode 100644 content/canvas/test/test_2d.line.miter.rightangle.html
 delete mode 100644 content/canvas/test/test_2d.line.miter.within.html
 delete mode 100644 content/canvas/test/test_2d.line.union.html
 delete mode 100644 content/canvas/test/test_2d.line.width.basic.html
 delete mode 100644 content/canvas/test/test_2d.line.width.invalid.html
 delete mode 100644 content/canvas/test/test_2d.line.width.transformed.html
 delete mode 100644 content/canvas/test/test_2d.missingargs.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.angle.1.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.angle.2.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.angle.3.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.angle.4.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.angle.5.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.angle.6.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.empty.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.end.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.negative.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.nonempty.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.scale.1.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.scale.2.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.selfintersect.1.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.selfintersect.2.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.shape.1.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.shape.2.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.shape.4.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.shape.5.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.twopie.1.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.twopie.2.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.twopie.3.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.twopie.4.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.zero.1.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.zero.2.html
 delete mode 100644 content/canvas/test/test_2d.path.arc.zeroradius.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.coincide.1.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.coincide.2.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.collinear.1.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.collinear.2.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.collinear.3.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.emptysubpath.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.negative.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.scale.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.shape.curve1.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.shape.curve2.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.shape.end.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.shape.start.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.transformation.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.zero.1.html
 delete mode 100644 content/canvas/test/test_2d.path.arcTo.zero.2.html
 delete mode 100644 content/canvas/test/test_2d.path.beginPath.html
 delete mode 100644 content/canvas/test/test_2d.path.bezierCurveTo.basic.html
 delete mode 100644 content/canvas/test/test_2d.path.bezierCurveTo.emptysubpath.html
 delete mode 100644 content/canvas/test/test_2d.path.bezierCurveTo.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.path.bezierCurveTo.scaled.html
 delete mode 100644 content/canvas/test/test_2d.path.bezierCurveTo.shape.html
 delete mode 100644 content/canvas/test/test_2d.path.clip.basic.1.html
 delete mode 100644 content/canvas/test/test_2d.path.clip.basic.2.html
 delete mode 100644 content/canvas/test/test_2d.path.clip.empty.html
 delete mode 100644 content/canvas/test/test_2d.path.clip.intersect.html
 delete mode 100644 content/canvas/test/test_2d.path.clip.unaffected.html
 delete mode 100644 content/canvas/test/test_2d.path.clip.winding.1.html
 delete mode 100644 content/canvas/test/test_2d.path.clip.winding.2.html
 delete mode 100644 content/canvas/test/test_2d.path.closePath.empty.html
 delete mode 100644 content/canvas/test/test_2d.path.closePath.newline.html
 delete mode 100644 content/canvas/test/test_2d.path.closePath.nextpoint.html
 delete mode 100644 content/canvas/test/test_2d.path.fill.closed.basic.html
 delete mode 100644 content/canvas/test/test_2d.path.fill.closed.unaffected.html
 delete mode 100644 content/canvas/test/test_2d.path.fill.overlap.html
 delete mode 100644 content/canvas/test/test_2d.path.fill.winding.add.html
 delete mode 100644 content/canvas/test/test_2d.path.fill.winding.subtract.1.html
 delete mode 100644 content/canvas/test/test_2d.path.fill.winding.subtract.2.html
 delete mode 100644 content/canvas/test/test_2d.path.fill.winding.subtract.3.html
 delete mode 100644 content/canvas/test/test_2d.path.initial.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.arc.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.basic.1.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.basic.2.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.bezier.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.bigarc.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.edge.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.empty.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.outside.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.subpath.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.transform.1.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.transform.2.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.transform.3.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.unclosed.html
 delete mode 100644 content/canvas/test/test_2d.path.isPointInPath.winding.html
 delete mode 100644 content/canvas/test/test_2d.path.lineTo.basic.html
 delete mode 100644 content/canvas/test/test_2d.path.lineTo.emptysubpath.html
 delete mode 100644 content/canvas/test/test_2d.path.lineTo.nextpoint.html
 delete mode 100644 content/canvas/test/test_2d.path.lineTo.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.path.moveTo.basic.html
 delete mode 100644 content/canvas/test/test_2d.path.moveTo.multiple.html
 delete mode 100644 content/canvas/test/test_2d.path.moveTo.newsubpath.html
 delete mode 100644 content/canvas/test/test_2d.path.moveTo.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.path.quadraticCurveTo.basic.html
 delete mode 100644 content/canvas/test/test_2d.path.quadraticCurveTo.emptysubpath.html
 delete mode 100644 content/canvas/test/test_2d.path.quadraticCurveTo.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.path.quadraticCurveTo.scaled.html
 delete mode 100644 content/canvas/test/test_2d.path.quadraticCurveTo.shape.html
 delete mode 100644 content/canvas/test/test_2d.path.rect.basic.html
 delete mode 100644 content/canvas/test/test_2d.path.rect.closed.html
 delete mode 100644 content/canvas/test/test_2d.path.rect.end.1.html
 delete mode 100644 content/canvas/test/test_2d.path.rect.end.2.html
 delete mode 100644 content/canvas/test/test_2d.path.rect.negative.html
 delete mode 100644 content/canvas/test/test_2d.path.rect.newsubpath.html
 delete mode 100644 content/canvas/test/test_2d.path.rect.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.path.rect.winding.html
 delete mode 100644 content/canvas/test/test_2d.path.rect.zero.1.html
 delete mode 100644 content/canvas/test/test_2d.path.rect.zero.2.html
 delete mode 100644 content/canvas/test/test_2d.path.rect.zero.3.html
 delete mode 100644 content/canvas/test/test_2d.path.rect.zero.4.html
 delete mode 100644 content/canvas/test/test_2d.path.rect.zero.5.html
 delete mode 100644 content/canvas/test/test_2d.path.stroke.empty.html
 delete mode 100644 content/canvas/test/test_2d.path.stroke.overlap.html
 delete mode 100644 content/canvas/test/test_2d.path.stroke.prune.arc.html
 delete mode 100644 content/canvas/test/test_2d.path.stroke.prune.closed.html
 delete mode 100644 content/canvas/test/test_2d.path.stroke.prune.corner.html
 delete mode 100644 content/canvas/test/test_2d.path.stroke.prune.curve.html
 delete mode 100644 content/canvas/test/test_2d.path.stroke.prune.line.html
 delete mode 100644 content/canvas/test/test_2d.path.stroke.prune.rect.html
 delete mode 100644 content/canvas/test/test_2d.path.stroke.scale1.html
 delete mode 100644 content/canvas/test/test_2d.path.stroke.scale2.html
 delete mode 100644 content/canvas/test/test_2d.path.stroke.skew.html
 delete mode 100644 content/canvas/test/test_2d.path.stroke.unaffected.html
 delete mode 100644 content/canvas/test/test_2d.path.stroke.union.html
 delete mode 100644 content/canvas/test/test_2d.path.transformation.basic.html
 delete mode 100644 content/canvas/test/test_2d.path.transformation.changing.html
 delete mode 100644 content/canvas/test/test_2d.path.transformation.multiple.html
 delete mode 100644 content/canvas/test/test_2d.pattern.animated.gif.html
 delete mode 100644 content/canvas/test/test_2d.pattern.basic.canvas.html
 delete mode 100644 content/canvas/test/test_2d.pattern.basic.image.html
 delete mode 100644 content/canvas/test/test_2d.pattern.basic.nocontext.html
 delete mode 100644 content/canvas/test/test_2d.pattern.basic.type.html
 delete mode 100644 content/canvas/test/test_2d.pattern.basic.zerocanvas.html
 delete mode 100644 content/canvas/test/test_2d.pattern.crosscanvas.html
 delete mode 100644 content/canvas/test/test_2d.pattern.image.broken.html
 delete mode 100644 content/canvas/test/test_2d.pattern.image.incomplete.html
 delete mode 100644 content/canvas/test/test_2d.pattern.image.null.html
 delete mode 100644 content/canvas/test/test_2d.pattern.image.string.html
 delete mode 100644 content/canvas/test/test_2d.pattern.image.undefined.html
 delete mode 100644 content/canvas/test/test_2d.pattern.modify.canvas1.html
 delete mode 100644 content/canvas/test/test_2d.pattern.modify.canvas2.html
 delete mode 100644 content/canvas/test/test_2d.pattern.modify.image1.html
 delete mode 100644 content/canvas/test/test_2d.pattern.modify.image2.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.norepeat.basic.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.norepeat.coord1.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.norepeat.coord2.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.norepeat.coord3.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.norepeat.outside.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.orientation.canvas.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.orientation.image.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.repeat.basic.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.repeat.coord1.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.repeat.coord2.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.repeat.coord3.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.repeat.outside.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.repeatx.basic.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.repeatx.coord1.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.repeatx.outside.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.repeaty.basic.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.repeaty.coord1.html
 delete mode 100644 content/canvas/test/test_2d.pattern.paint.repeaty.outside.html
 delete mode 100644 content/canvas/test/test_2d.pattern.repeat.case.html
 delete mode 100644 content/canvas/test/test_2d.pattern.repeat.empty.html
 delete mode 100644 content/canvas/test/test_2d.pattern.repeat.null.html
 delete mode 100644 content/canvas/test/test_2d.pattern.repeat.nullsuffix.html
 delete mode 100644 content/canvas/test/test_2d.pattern.repeat.undefined.html
 delete mode 100644 content/canvas/test/test_2d.pattern.repeat.unrecognised.html
 delete mode 100644 content/canvas/test/test_2d.scaled.html
 delete mode 100644 content/canvas/test/test_2d.shadow.alpha.1.html
 delete mode 100644 content/canvas/test/test_2d.shadow.alpha.2.html
 delete mode 100644 content/canvas/test/test_2d.shadow.alpha.3.html
 delete mode 100644 content/canvas/test/test_2d.shadow.alpha.4.html
 delete mode 100644 content/canvas/test/test_2d.shadow.alpha.5.html
 delete mode 100644 content/canvas/test/test_2d.shadow.attributes.shadowBlur.1.html
 delete mode 100644 content/canvas/test/test_2d.shadow.attributes.shadowBlur.2.html
 delete mode 100644 content/canvas/test/test_2d.shadow.attributes.shadowColor.1.html
 delete mode 100644 content/canvas/test/test_2d.shadow.attributes.shadowColor.2.html
 delete mode 100644 content/canvas/test/test_2d.shadow.attributes.shadowOffset.1.html
 delete mode 100644 content/canvas/test/test_2d.shadow.attributes.shadowOffset.2.html
 delete mode 100644 content/canvas/test/test_2d.shadow.basic.1.html
 delete mode 100644 content/canvas/test/test_2d.shadow.basic.2.html
 delete mode 100644 content/canvas/test/test_2d.shadow.blur.high.html
 delete mode 100644 content/canvas/test/test_2d.shadow.blur.low.html
 delete mode 100644 content/canvas/test/test_2d.shadow.canvas.alpha.html
 delete mode 100644 content/canvas/test/test_2d.shadow.canvas.basic.html
 delete mode 100644 content/canvas/test/test_2d.shadow.canvas.transparent.1.html
 delete mode 100644 content/canvas/test/test_2d.shadow.canvas.transparent.2.html
 delete mode 100644 content/canvas/test/test_2d.shadow.clip.1.html
 delete mode 100644 content/canvas/test/test_2d.shadow.clip.2.html
 delete mode 100644 content/canvas/test/test_2d.shadow.clip.3.html
 delete mode 100644 content/canvas/test/test_2d.shadow.composite.1.html
 delete mode 100644 content/canvas/test/test_2d.shadow.composite.2.html
 delete mode 100644 content/canvas/test/test_2d.shadow.composite.3.html
 delete mode 100644 content/canvas/test/test_2d.shadow.composite.4.html
 delete mode 100644 content/canvas/test/test_2d.shadow.gradient.alpha.html
 delete mode 100644 content/canvas/test/test_2d.shadow.gradient.basic.html
 delete mode 100644 content/canvas/test/test_2d.shadow.gradient.transparent.1.html
 delete mode 100644 content/canvas/test/test_2d.shadow.gradient.transparent.2.html
 delete mode 100644 content/canvas/test/test_2d.shadow.image.alpha.html
 delete mode 100644 content/canvas/test/test_2d.shadow.image.basic.html
 delete mode 100644 content/canvas/test/test_2d.shadow.image.scale.html
 delete mode 100644 content/canvas/test/test_2d.shadow.image.section.html
 delete mode 100644 content/canvas/test/test_2d.shadow.image.transparent.1.html
 delete mode 100644 content/canvas/test/test_2d.shadow.image.transparent.2.html
 delete mode 100644 content/canvas/test/test_2d.shadow.offset.negativeX.html
 delete mode 100644 content/canvas/test/test_2d.shadow.offset.negativeY.html
 delete mode 100644 content/canvas/test/test_2d.shadow.offset.positiveX.html
 delete mode 100644 content/canvas/test/test_2d.shadow.offset.positiveY.html
 delete mode 100644 content/canvas/test/test_2d.shadow.outside.html
 delete mode 100644 content/canvas/test/test_2d.shadow.pattern.alpha.html
 delete mode 100644 content/canvas/test/test_2d.shadow.pattern.basic.html
 delete mode 100644 content/canvas/test/test_2d.shadow.pattern.transparent.1.html
 delete mode 100644 content/canvas/test/test_2d.shadow.pattern.transparent.2.html
 delete mode 100644 content/canvas/test/test_2d.shadow.stroke.basic.html
 delete mode 100644 content/canvas/test/test_2d.shadow.stroke.cap.1.html
 delete mode 100644 content/canvas/test/test_2d.shadow.stroke.cap.2.html
 delete mode 100644 content/canvas/test/test_2d.shadow.stroke.join.1.html
 delete mode 100644 content/canvas/test/test_2d.shadow.stroke.join.2.html
 delete mode 100644 content/canvas/test/test_2d.shadow.stroke.join.3.html
 delete mode 100644 content/canvas/test/test_2d.shadow.transform.1.html
 delete mode 100644 content/canvas/test/test_2d.shadow.transform.2.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.bitmap.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.clip.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.fillStyle.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.globalAlpha.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.globalCompositeOperation.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.lineCap.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.lineJoin.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.lineWidth.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.miterLimit.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.path.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.shadowBlur.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.shadowColor.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.shadowOffsetX.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.shadowOffsetY.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.stack.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.stackdepth.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.strokeStyle.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.transformation.html
 delete mode 100644 content/canvas/test/test_2d.state.saverestore.underflow.html
 delete mode 100644 content/canvas/test/test_2d.strokeRect.basic.html
 delete mode 100644 content/canvas/test/test_2d.strokeRect.clip.html
 delete mode 100644 content/canvas/test/test_2d.strokeRect.globalalpha.html
 delete mode 100644 content/canvas/test/test_2d.strokeRect.globalcomposite.html
 delete mode 100644 content/canvas/test/test_2d.strokeRect.negative.html
 delete mode 100644 content/canvas/test/test_2d.strokeRect.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.strokeRect.path.html
 delete mode 100644 content/canvas/test/test_2d.strokeRect.shadow.html
 delete mode 100644 content/canvas/test/test_2d.strokeRect.transform.html
 delete mode 100644 content/canvas/test/test_2d.strokeRect.zero.1.html
 delete mode 100644 content/canvas/test/test_2d.strokeRect.zero.2.html
 delete mode 100644 content/canvas/test/test_2d.strokeRect.zero.3.html
 delete mode 100644 content/canvas/test/test_2d.strokeRect.zero.4.html
 delete mode 100644 content/canvas/test/test_2d.strokeStyle.default.html
 delete mode 100644 content/canvas/test/test_2d.transformation.order.html
 delete mode 100644 content/canvas/test/test_2d.transformation.rotate.direction.html
 delete mode 100644 content/canvas/test/test_2d.transformation.rotate.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.transformation.rotate.radians.html
 delete mode 100644 content/canvas/test/test_2d.transformation.rotate.wrap.html
 delete mode 100644 content/canvas/test/test_2d.transformation.rotate.wrapnegative.html
 delete mode 100644 content/canvas/test/test_2d.transformation.rotate.zero.html
 delete mode 100644 content/canvas/test/test_2d.transformation.scale.basic.html
 delete mode 100644 content/canvas/test/test_2d.transformation.scale.large.html
 delete mode 100644 content/canvas/test/test_2d.transformation.scale.multiple.html
 delete mode 100644 content/canvas/test/test_2d.transformation.scale.negative.html
 delete mode 100644 content/canvas/test/test_2d.transformation.scale.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.transformation.scale.zero.html
 delete mode 100644 content/canvas/test/test_2d.transformation.setTransform.multiple.html
 delete mode 100644 content/canvas/test/test_2d.transformation.setTransform.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.transformation.setTransform.skewed.html
 delete mode 100644 content/canvas/test/test_2d.transformation.transform.identity.html
 delete mode 100644 content/canvas/test/test_2d.transformation.transform.multiply.html
 delete mode 100644 content/canvas/test/test_2d.transformation.transform.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.transformation.transform.skewed.html
 delete mode 100644 content/canvas/test/test_2d.transformation.translate.basic.html
 delete mode 100644 content/canvas/test/test_2d.transformation.translate.nonfinite.html
 delete mode 100644 content/canvas/test/test_2d.type.delete.html
 delete mode 100644 content/canvas/test/test_2d.type.exists.html
 delete mode 100644 content/canvas/test/test_2d.type.extend.html
 delete mode 100644 content/canvas/test/test_2d.type.prototype.html
 delete mode 100644 content/canvas/test/test_2d.type.replace.html
 delete mode 100644 content/canvas/test/test_2d.voidreturn.html
 delete mode 100644 content/canvas/test/test_bug397524.html
 delete mode 100644 content/canvas/test/test_bug405982.html
 delete mode 100644 content/canvas/test/test_context.arguments.extra.html
 delete mode 100644 content/canvas/test/test_context.arguments.missing.html
 delete mode 100644 content/canvas/test/test_context.casesensitive.html
 delete mode 100644 content/canvas/test/test_context.emptystring.html
 delete mode 100644 content/canvas/test/test_context.unrecognised.badname.html
 delete mode 100644 content/canvas/test/test_context.unrecognised.badsuffix.html
 delete mode 100644 content/canvas/test/test_context.unrecognised.nullsuffix.html
 delete mode 100644 content/canvas/test/test_context.unrecognised.unicode.html
 delete mode 100644 content/canvas/test/test_fallback.basic.html
 delete mode 100644 content/canvas/test/test_fallback.multiple.html
 delete mode 100644 content/canvas/test/test_fallback.nested.html
 delete mode 100644 content/canvas/test/test_initial.colour.html
 delete mode 100644 content/canvas/test/test_initial.reset.2dstate.html
 delete mode 100644 content/canvas/test/test_initial.reset.clip.html
 delete mode 100644 content/canvas/test/test_initial.reset.different.html
 delete mode 100644 content/canvas/test/test_initial.reset.gradient.html
 delete mode 100644 content/canvas/test/test_initial.reset.path.html
 delete mode 100644 content/canvas/test/test_initial.reset.pattern.html
 delete mode 100644 content/canvas/test/test_initial.reset.same.html
 delete mode 100644 content/canvas/test/test_initial.reset.transform.html
 delete mode 100644 content/canvas/test/test_size.attributes.default.html
 delete mode 100644 content/canvas/test/test_size.attributes.html
 delete mode 100644 content/canvas/test/test_size.attributes.parse.badsuffix.html
 delete mode 100644 content/canvas/test/test_size.attributes.parse.floatsuffix.html
 delete mode 100644 content/canvas/test/test_size.attributes.parse.negative.html
 delete mode 100644 content/canvas/test/test_size.attributes.parse.nonnumber.html
 delete mode 100644 content/canvas/test/test_size.attributes.parse.percentsuffix.html
 delete mode 100644 content/canvas/test/test_size.attributes.parse.whitespace.html
 delete mode 100644 content/canvas/test/test_size.attributes.parse.zero.html
 delete mode 100644 content/canvas/test/test_size.attributes.parse.zerosuffix.html
 delete mode 100644 content/canvas/test/test_size.attributes.reflect.1.html
 delete mode 100644 content/canvas/test/test_size.attributes.reflect.2.html
 delete mode 100644 content/canvas/test/test_size.attributes.removed.html
 delete mode 100644 content/canvas/test/test_size.attributes.setAttribute.badsuffix.html
 delete mode 100644 content/canvas/test/test_size.attributes.setAttribute.floatsuffix.html
 delete mode 100644 content/canvas/test/test_size.attributes.setAttribute.negative.html
 delete mode 100644 content/canvas/test/test_size.attributes.setAttribute.nonnumber.html
 delete mode 100644 content/canvas/test/test_size.attributes.setAttribute.percentsuffix.html
 delete mode 100644 content/canvas/test/test_size.attributes.setAttribute.whitespace.html
 delete mode 100644 content/canvas/test/test_size.attributes.setAttribute.zero.html
 delete mode 100644 content/canvas/test/test_size.attributes.setAttribute.zerosuffix.html
 delete mode 100644 content/canvas/test/test_size.attributes.style.html
 delete mode 100644 content/canvas/test/test_size.attributes.type.get.html
 delete mode 100644 content/canvas/test/test_size.attributes.type.set.html
 delete mode 100644 content/canvas/test/test_text.font.html
 delete mode 100644 content/canvas/test/test_text.measure.html
 delete mode 100644 content/canvas/test/test_text.space.replace.html
 delete mode 100644 content/canvas/test/test_text.textAlign.html
 delete mode 100644 content/canvas/test/test_text.textBaseline.html
 delete mode 100644 content/canvas/test/test_toDataURL.arguments.1.html
 delete mode 100644 content/canvas/test/test_toDataURL.arguments.2.html
 delete mode 100644 content/canvas/test/test_toDataURL.arguments.3.html
 delete mode 100644 content/canvas/test/test_toDataURL.complexcolours.html
 delete mode 100644 content/canvas/test/test_toDataURL.default.html
 delete mode 100644 content/canvas/test/test_toDataURL.lowercase.html
 delete mode 100644 content/canvas/test/test_toDataURL.nocontext.html
 delete mode 100644 content/canvas/test/test_toDataURL.png.html
 delete mode 100644 content/canvas/test/test_toDataURL.primarycolours.html
 delete mode 100644 content/canvas/test/test_toDataURL.unrecognised.html
 delete mode 100644 content/canvas/test/test_toDataURL.zerosize.html
 delete mode 100644 content/canvas/test/test_type.delete.html
 delete mode 100644 content/canvas/test/test_type.exists.html
 delete mode 100644 content/canvas/test/test_type.extend.html
 delete mode 100644 content/canvas/test/test_type.name.html
 delete mode 100644 content/canvas/test/test_type.prototype.html
 delete mode 100644 content/canvas/test/test_type.replace.html

diff --git a/content/canvas/test/test_2d.canvas.readonly.html b/content/canvas/test/test_2d.canvas.readonly.html
deleted file mode 100644
index a03216ba61fc..000000000000
--- a/content/canvas/test/test_2d.canvas.readonly.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.canvas.readonly</title>
-<!-- Testing: CanvasRenderingContext2D.canvas is readonly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var c = document.createElement('canvas');
-var d = ctx.canvas;
-ok(c !== d, "c !== d");
-try { ctx.canvas = c; } catch (e) {} // not sure whether this should throw or not...
-ok(ctx.canvas === d, "ctx.canvas === d");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.canvas.reference.html b/content/canvas/test/test_2d.canvas.reference.html
deleted file mode 100644
index 0c6bce42bfae..000000000000
--- a/content/canvas/test/test_2d.canvas.reference.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.canvas.reference</title>
-<!-- Testing: CanvasRenderingContext2D.canvas refers back to its canvas -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(ctx.canvas === canvas, "ctx.canvas === canvas");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.clearRect.basic.html b/content/canvas/test/test_2d.clearRect.basic.html
deleted file mode 100644
index f6a04dbc0b43..000000000000
--- a/content/canvas/test/test_2d.clearRect.basic.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.clearRect.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.clearRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.clearRect.clip.html b/content/canvas/test/test_2d.clearRect.clip.html
deleted file mode 100644
index efc58ba602eb..000000000000
--- a/content/canvas/test/test_2d.clearRect.clip.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.clearRect.clip</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.beginPath();
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.clearRect.globalalpha.html b/content/canvas/test/test_2d.clearRect.globalalpha.html
deleted file mode 100644
index 6ce266cda3fd..000000000000
--- a/content/canvas/test/test_2d.clearRect.globalalpha.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.clearRect.globalalpha</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalAlpha = 0.1;
-ctx.clearRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.clearRect.globalcomposite.html b/content/canvas/test/test_2d.clearRect.globalcomposite.html
deleted file mode 100644
index e21781c7eebf..000000000000
--- a/content/canvas/test/test_2d.clearRect.globalcomposite.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.clearRect.globalcomposite</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'destination-atop';
-ctx.clearRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.clearRect.negative.html b/content/canvas/test/test_2d.clearRect.negative.html
deleted file mode 100644
index 95fc4a9df93e..000000000000
--- a/content/canvas/test/test_2d.clearRect.negative.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.clearRect.negative</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.clearRect(0, 0, 50, 25);
-ctx.clearRect(100, 0, -50, 25);
-ctx.clearRect(0, 50, 50, -25);
-ctx.clearRect(100, 50, -50, -25);
-isPixel(ctx, 25,12, 0,0,0,0, "25,12", "0,0,0,0", 0);
-isPixel(ctx, 75,12, 0,0,0,0, "75,12", "0,0,0,0", 0);
-isPixel(ctx, 25,37, 0,0,0,0, "25,37", "0,0,0,0", 0);
-isPixel(ctx, 75,37, 0,0,0,0, "75,37", "0,0,0,0", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.clearRect.nonfinite.html b/content/canvas/test/test_2d.clearRect.nonfinite.html
deleted file mode 100644
index 0550a7d0a069..000000000000
--- a/content/canvas/test/test_2d.clearRect.nonfinite.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.clearRect.nonfinite</title>
-<!-- Testing: clearRect() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.clearRect(Infinity, 0, 100, 50);
-ctx.clearRect(-Infinity, 0, 100, 50);
-ctx.clearRect(NaN, 0, 100, 50);
-ctx.clearRect(0, Infinity, 100, 50);
-ctx.clearRect(0, -Infinity, 100, 50);
-ctx.clearRect(0, NaN, 100, 50);
-ctx.clearRect(0, 0, Infinity, 50);
-ctx.clearRect(0, 0, -Infinity, 50);
-ctx.clearRect(0, 0, NaN, 50);
-ctx.clearRect(0, 0, 100, Infinity);
-ctx.clearRect(0, 0, 100, -Infinity);
-ctx.clearRect(0, 0, 100, NaN);
-ctx.clearRect(Infinity, Infinity, 100, 50);
-ctx.clearRect(Infinity, Infinity, Infinity, 50);
-ctx.clearRect(Infinity, Infinity, Infinity, Infinity);
-ctx.clearRect(Infinity, Infinity, 100, Infinity);
-ctx.clearRect(Infinity, 0, Infinity, 50);
-ctx.clearRect(Infinity, 0, Infinity, Infinity);
-ctx.clearRect(Infinity, 0, 100, Infinity);
-ctx.clearRect(0, Infinity, Infinity, 50);
-ctx.clearRect(0, Infinity, Infinity, Infinity);
-ctx.clearRect(0, Infinity, 100, Infinity);
-ctx.clearRect(0, 0, Infinity, Infinity);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.clearRect.path.html b/content/canvas/test/test_2d.clearRect.path.html
deleted file mode 100644
index d7011d762ebf..000000000000
--- a/content/canvas/test/test_2d.clearRect.path.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.clearRect.path</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.clearRect.shadow.html b/content/canvas/test/test_2d.clearRect.shadow.html
deleted file mode 100644
index 9ce568df8462..000000000000
--- a/content/canvas/test/test_2d.clearRect.shadow.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.clearRect.shadow</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowColor = '#f00';
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.clearRect.transform.html b/content/canvas/test/test_2d.clearRect.transform.html
deleted file mode 100644
index daec56c2a9a6..000000000000
--- a/content/canvas/test/test_2d.clearRect.transform.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.clearRect.transform</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.clearRect.zero.html b/content/canvas/test/test_2d.clearRect.zero.html
deleted file mode 100644
index 0cc218b45704..000000000000
--- a/content/canvas/test/test_2d.clearRect.zero.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.clearRect.zero</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.canvas.copy.html b/content/canvas/test/test_2d.composite.canvas.copy.html
deleted file mode 100644
index 513e4b801911..000000000000
--- a/content/canvas/test/test_2d.composite.canvas.copy.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.canvas.copy</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = canvas.width;
-canvas2.height = canvas.height;
-var ctx2 = canvas2.getContext('2d');
-ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
-ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'copy';
-ctx.drawImage(canvas2, 0, 0);
-isPixel(ctx, 50,25, 255,255,0,191, "50,25", "255,255,0,191", 5);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_yellow75.png" id="yellow75.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.composite.canvas.destination-out.html b/content/canvas/test/test_2d.composite.canvas.destination-out.html
deleted file mode 100644
index 46980090ead1..000000000000
--- a/content/canvas/test/test_2d.composite.canvas.destination-out.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.canvas.destination-out</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = canvas.width;
-canvas2.height = canvas.height;
-var ctx2 = canvas2.getContext('2d');
-ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
-ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'destination-out';
-ctx.drawImage(canvas2, 0, 0);
-isPixel(ctx, 50,25, 0,255,255,31, "50,25", "0,255,255,31", 5);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_yellow75.png" id="yellow75.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.composite.canvas.destination-over.html b/content/canvas/test/test_2d.composite.canvas.destination-over.html
deleted file mode 100644
index 8fce7f08f5a5..000000000000
--- a/content/canvas/test/test_2d.composite.canvas.destination-over.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.canvas.destination-over</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = canvas.width;
-canvas2.height = canvas.height;
-var ctx2 = canvas2.getContext('2d');
-ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
-ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'destination-over';
-ctx.drawImage(canvas2, 0, 0);
-isPixel(ctx, 50,25, 109,255,145,223, "50,25", "109,255,145,223", 5);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_yellow75.png" id="yellow75.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.composite.canvas.source-atop.html b/content/canvas/test/test_2d.composite.canvas.source-atop.html
deleted file mode 100644
index 2dfb5e620da4..000000000000
--- a/content/canvas/test/test_2d.composite.canvas.source-atop.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.canvas.source-atop</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = canvas.width;
-canvas2.height = canvas.height;
-var ctx2 = canvas2.getContext('2d');
-ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
-ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'source-atop';
-ctx.drawImage(canvas2, 0, 0);
-isPixel(ctx, 50,25, 191,255,63,127, "50,25", "191,255,63,127", 5);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_yellow75.png" id="yellow75.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.composite.canvas.source-over.html b/content/canvas/test/test_2d.composite.canvas.source-over.html
deleted file mode 100644
index a1bde6da09fc..000000000000
--- a/content/canvas/test/test_2d.composite.canvas.source-over.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.canvas.source-over</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = canvas.width;
-canvas2.height = canvas.height;
-var ctx2 = canvas2.getContext('2d');
-ctx2.drawImage(document.getElementById('yellow75.png'), 0, 0);
-ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'source-over';
-ctx.drawImage(canvas2, 0, 0);
-isPixel(ctx, 50,25, 218,255,36,223, "50,25", "218,255,36,223", 5);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_yellow75.png" id="yellow75.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.composite.clip.copy.html b/content/canvas/test/test_2d.composite.clip.copy.html
deleted file mode 100644
index eca443870584..000000000000
--- a/content/canvas/test/test_2d.composite.clip.copy.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.clip.copy</title>
-<!-- Testing: fill() does not affect pixels outside the clip region. -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'copy';
-ctx.rect(-20, -20, 10, 10);
-ctx.clip();
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 50, 50);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.clip.destination-atop.html b/content/canvas/test/test_2d.composite.clip.destination-atop.html
deleted file mode 100644
index 6d124eb9e479..000000000000
--- a/content/canvas/test/test_2d.composite.clip.destination-atop.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.clip.destination-atop</title>
-<!-- Testing: fill() does not affect pixels outside the clip region. -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'destination-atop';
-ctx.rect(-20, -20, 10, 10);
-ctx.clip();
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 50, 50);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.clip.destination-in.html b/content/canvas/test/test_2d.composite.clip.destination-in.html
deleted file mode 100644
index 85e4e9bc5989..000000000000
--- a/content/canvas/test/test_2d.composite.clip.destination-in.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.clip.destination-in</title>
-<!-- Testing: fill() does not affect pixels outside the clip region. -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'destination-in';
-ctx.rect(-20, -20, 10, 10);
-ctx.clip();
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 50, 50);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.clip.destination-out.html b/content/canvas/test/test_2d.composite.clip.destination-out.html
deleted file mode 100644
index db77fe525a35..000000000000
--- a/content/canvas/test/test_2d.composite.clip.destination-out.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.clip.destination-out</title>
-<!-- Testing: fill() does not affect pixels outside the clip region. -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'destination-out';
-ctx.rect(-20, -20, 10, 10);
-ctx.clip();
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 50, 50);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.clip.destination-over.html b/content/canvas/test/test_2d.composite.clip.destination-over.html
deleted file mode 100644
index a6d2949618bd..000000000000
--- a/content/canvas/test/test_2d.composite.clip.destination-over.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.clip.destination-over</title>
-<!-- Testing: fill() does not affect pixels outside the clip region. -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'destination-over';
-ctx.rect(-20, -20, 10, 10);
-ctx.clip();
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 50, 50);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.clip.source-atop.html b/content/canvas/test/test_2d.composite.clip.source-atop.html
deleted file mode 100644
index f48152348eec..000000000000
--- a/content/canvas/test/test_2d.composite.clip.source-atop.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.clip.source-atop</title>
-<!-- Testing: fill() does not affect pixels outside the clip region. -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'source-atop';
-ctx.rect(-20, -20, 10, 10);
-ctx.clip();
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 50, 50);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.clip.source-in.html b/content/canvas/test/test_2d.composite.clip.source-in.html
deleted file mode 100644
index d943052830ee..000000000000
--- a/content/canvas/test/test_2d.composite.clip.source-in.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.clip.source-in</title>
-<!-- Testing: fill() does not affect pixels outside the clip region. -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'source-in';
-ctx.rect(-20, -20, 10, 10);
-ctx.clip();
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 50, 50);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.clip.source-out.html b/content/canvas/test/test_2d.composite.clip.source-out.html
deleted file mode 100644
index 0cc9dc2cb698..000000000000
--- a/content/canvas/test/test_2d.composite.clip.source-out.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.clip.source-out</title>
-<!-- Testing: fill() does not affect pixels outside the clip region. -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'source-out';
-ctx.rect(-20, -20, 10, 10);
-ctx.clip();
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 50, 50);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.clip.source-over.html b/content/canvas/test/test_2d.composite.clip.source-over.html
deleted file mode 100644
index 1cc4a3543022..000000000000
--- a/content/canvas/test/test_2d.composite.clip.source-over.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.clip.source-over</title>
-<!-- Testing: fill() does not affect pixels outside the clip region. -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'source-over';
-ctx.rect(-20, -20, 10, 10);
-ctx.clip();
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 50, 50);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.canvas.html b/content/canvas/test/test_2d.composite.globalAlpha.canvas.html
deleted file mode 100644
index f45c88641d3a..000000000000
--- a/content/canvas/test/test_2d.composite.globalAlpha.canvas.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.globalAlpha.canvas</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = 100;
-canvas2.height = 50;
-var ctx2 = canvas2.getContext('2d');
-ctx2.fillStyle = '#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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.canvaspattern.html b/content/canvas/test/test_2d.composite.globalAlpha.canvaspattern.html
deleted file mode 100644
index 3322195ed89e..000000000000
--- a/content/canvas/test/test_2d.composite.globalAlpha.canvaspattern.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.globalAlpha.canvaspattern - bug 401790</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = 100;
-canvas2.height = 50;
-var ctx2 = canvas2.getContext('2d');
-ctx2.fillStyle = '#f00';
-ctx2.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#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);
-isPixel(ctx, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.default.html b/content/canvas/test/test_2d.composite.globalAlpha.default.html
deleted file mode 100644
index d1209594cad6..000000000000
--- a/content/canvas/test/test_2d.composite.globalAlpha.default.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.globalAlpha.default</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(ctx.globalAlpha === 1.0, "ctx.globalAlpha === 1.0");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.fill.html b/content/canvas/test/test_2d.composite.globalAlpha.fill.html
deleted file mode 100644
index bbb98d9678d1..000000000000
--- a/content/canvas/test/test_2d.composite.globalAlpha.fill.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.globalAlpha.fill</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.image.html b/content/canvas/test/test_2d.composite.globalAlpha.image.html
deleted file mode 100644
index ec1ef523f85f..000000000000
--- a/content/canvas/test/test_2d.composite.globalAlpha.image.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.globalAlpha.image</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red.png" id="red.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.imagepattern.html b/content/canvas/test/test_2d.composite.globalAlpha.imagepattern.html
deleted file mode 100644
index 041092c45feb..000000000000
--- a/content/canvas/test/test_2d.composite.globalAlpha.imagepattern.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.globalAlpha.imagepattern - bug 401790</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-isPixel(ctx, 50,25, 2,253,0,255, "50,25", "2,253,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red.png" id="red.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.invalid.html b/content/canvas/test/test_2d.composite.globalAlpha.invalid.html
deleted file mode 100644
index 16bce938d8b8..000000000000
--- a/content/canvas/test/test_2d.composite.globalAlpha.invalid.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.globalAlpha.invalid</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.globalAlpha = 0.5;
-var a = ctx.globalAlpha; // might not be exactly 0.5, if it is rounded/quantised, so remember for future comparisons
-var _thrown = undefined; try {
-  ctx.globalAlpha = Infinity;
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-ok(ctx.globalAlpha == a, "ctx.globalAlpha == a");
-var _thrown = undefined; try {
-  ctx.globalAlpha = -Infinity;
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-ok(ctx.globalAlpha == a, "ctx.globalAlpha == a");
-var _thrown = undefined; try {
-  ctx.globalAlpha = NaN;
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-ok(ctx.globalAlpha == a, "ctx.globalAlpha == a");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.globalAlpha.range.html b/content/canvas/test/test_2d.composite.globalAlpha.range.html
deleted file mode 100644
index 9f9861f4cee5..000000000000
--- a/content/canvas/test/test_2d.composite.globalAlpha.range.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.globalAlpha.range</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.image.copy.html b/content/canvas/test/test_2d.composite.image.copy.html
deleted file mode 100644
index a51a5ea22b2c..000000000000
--- a/content/canvas/test/test_2d.composite.image.copy.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.image.copy</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_yellow75.png" id="yellow75.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.composite.image.destination-out.html b/content/canvas/test/test_2d.composite.image.destination-out.html
deleted file mode 100644
index e896533137af..000000000000
--- a/content/canvas/test/test_2d.composite.image.destination-out.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.image.destination-out</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_yellow75.png" id="yellow75.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.composite.image.destination-over.html b/content/canvas/test/test_2d.composite.image.destination-over.html
deleted file mode 100644
index 2b1994cb3630..000000000000
--- a/content/canvas/test/test_2d.composite.image.destination-over.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.image.destination-over</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_yellow75.png" id="yellow75.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.composite.image.source-atop.html b/content/canvas/test/test_2d.composite.image.source-atop.html
deleted file mode 100644
index d32377cab42c..000000000000
--- a/content/canvas/test/test_2d.composite.image.source-atop.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.image.source-atop</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_yellow75.png" id="yellow75.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.composite.image.source-over.html b/content/canvas/test/test_2d.composite.image.source-over.html
deleted file mode 100644
index 68f4b5b36625..000000000000
--- a/content/canvas/test/test_2d.composite.image.source-over.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.image.source-over</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_yellow75.png" id="yellow75.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.composite.operation.casesensitive.html b/content/canvas/test/test_2d.composite.operation.casesensitive.html
deleted file mode 100644
index 67e7af9231c5..000000000000
--- a/content/canvas/test/test_2d.composite.operation.casesensitive.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.operation.casesensitive - bug 401788</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.globalCompositeOperation = 'xor';
-ctx.globalCompositeOperation = 'Source-over';
-ok(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.operation.clear.html b/content/canvas/test/test_2d.composite.operation.clear.html
deleted file mode 100644
index 66befef5da65..000000000000
--- a/content/canvas/test/test_2d.composite.operation.clear.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.operation.clear</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.globalCompositeOperation = 'xor';
-ctx.globalCompositeOperation = 'clear';
-todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.operation.darker.html b/content/canvas/test/test_2d.composite.operation.darker.html
deleted file mode 100644
index 755bf2d8a77e..000000000000
--- a/content/canvas/test/test_2d.composite.operation.darker.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.operation.darker</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.globalCompositeOperation = 'xor';
-ctx.globalCompositeOperation = 'darker';
-todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.operation.default.html b/content/canvas/test/test_2d.composite.operation.default.html
deleted file mode 100644
index d1f946e62843..000000000000
--- a/content/canvas/test/test_2d.composite.operation.default.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.operation.default</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(ctx.globalCompositeOperation == 'source-over', "ctx.globalCompositeOperation == 'source-over'");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.operation.get.html b/content/canvas/test/test_2d.composite.operation.get.html
deleted file mode 100644
index 5f990e858f20..000000000000
--- a/content/canvas/test/test_2d.composite.operation.get.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.operation.get</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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)+"\"]");
-}
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.operation.highlight.html b/content/canvas/test/test_2d.composite.operation.highlight.html
deleted file mode 100644
index 474b76a61333..000000000000
--- a/content/canvas/test/test_2d.composite.operation.highlight.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.operation.highlight - bug 401788</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.globalCompositeOperation = 'xor';
-ctx.globalCompositeOperation = 'highlight';
-ok(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.operation.nullsuffix.html b/content/canvas/test/test_2d.composite.operation.nullsuffix.html
deleted file mode 100644
index 388ed7cb9d5f..000000000000
--- a/content/canvas/test/test_2d.composite.operation.nullsuffix.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.operation.nullsuffix - bug 401788</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.globalCompositeOperation = 'xor';
-ctx.globalCompositeOperation = 'source-over\0';
-ok(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.operation.over.html b/content/canvas/test/test_2d.composite.operation.over.html
deleted file mode 100644
index 1ea9f976294a..000000000000
--- a/content/canvas/test/test_2d.composite.operation.over.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.operation.over</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.globalCompositeOperation = 'xor';
-ctx.globalCompositeOperation = 'over';
-todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.operation.unrecognised.html b/content/canvas/test/test_2d.composite.operation.unrecognised.html
deleted file mode 100644
index dd7976f1b4f6..000000000000
--- a/content/canvas/test/test_2d.composite.operation.unrecognised.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.operation.unrecognised - bug 401788</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.globalCompositeOperation = 'xor';
-ctx.globalCompositeOperation = 'nonexistent';
-ok(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.solid.copy.html b/content/canvas/test/test_2d.composite.solid.copy.html
deleted file mode 100644
index 127c3a500d5f..000000000000
--- a/content/canvas/test/test_2d.composite.solid.copy.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.solid.copy</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.solid.destination-atop.html b/content/canvas/test/test_2d.composite.solid.destination-atop.html
deleted file mode 100644
index f203013d4600..000000000000
--- a/content/canvas/test/test_2d.composite.solid.destination-atop.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.solid.destination-atop</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.solid.destination-in.html b/content/canvas/test/test_2d.composite.solid.destination-in.html
deleted file mode 100644
index 3848f8144da1..000000000000
--- a/content/canvas/test/test_2d.composite.solid.destination-in.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.solid.destination-in</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.solid.destination-out.html b/content/canvas/test/test_2d.composite.solid.destination-out.html
deleted file mode 100644
index ec18e3697fac..000000000000
--- a/content/canvas/test/test_2d.composite.solid.destination-out.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.solid.destination-out</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.solid.destination-over.html b/content/canvas/test/test_2d.composite.solid.destination-over.html
deleted file mode 100644
index 140af832ef85..000000000000
--- a/content/canvas/test/test_2d.composite.solid.destination-over.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.solid.destination-over</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.solid.source-atop.html b/content/canvas/test/test_2d.composite.solid.source-atop.html
deleted file mode 100644
index 947ae1266666..000000000000
--- a/content/canvas/test/test_2d.composite.solid.source-atop.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.solid.source-atop</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.solid.source-in.html b/content/canvas/test/test_2d.composite.solid.source-in.html
deleted file mode 100644
index f881d41420bc..000000000000
--- a/content/canvas/test/test_2d.composite.solid.source-in.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.solid.source-in</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.solid.source-out.html b/content/canvas/test/test_2d.composite.solid.source-out.html
deleted file mode 100644
index 5a4f5a515615..000000000000
--- a/content/canvas/test/test_2d.composite.solid.source-out.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.solid.source-out</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.solid.source-over.html b/content/canvas/test/test_2d.composite.solid.source-over.html
deleted file mode 100644
index 5b0bf103b1ec..000000000000
--- a/content/canvas/test/test_2d.composite.solid.source-over.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.solid.source-over</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.transparent.copy.html b/content/canvas/test/test_2d.composite.transparent.copy.html
deleted file mode 100644
index aa24a3e7758a..000000000000
--- a/content/canvas/test/test_2d.composite.transparent.copy.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.transparent.copy</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.transparent.destination-atop.html b/content/canvas/test/test_2d.composite.transparent.destination-atop.html
deleted file mode 100644
index 4ff92c4e795a..000000000000
--- a/content/canvas/test/test_2d.composite.transparent.destination-atop.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.transparent.destination-atop</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.transparent.destination-in.html b/content/canvas/test/test_2d.composite.transparent.destination-in.html
deleted file mode 100644
index b3d05694714f..000000000000
--- a/content/canvas/test/test_2d.composite.transparent.destination-in.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.transparent.destination-in</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.transparent.destination-out.html b/content/canvas/test/test_2d.composite.transparent.destination-out.html
deleted file mode 100644
index 5bd56b83f934..000000000000
--- a/content/canvas/test/test_2d.composite.transparent.destination-out.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.transparent.destination-out</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.transparent.destination-over.html b/content/canvas/test/test_2d.composite.transparent.destination-over.html
deleted file mode 100644
index d55d2c02d3c7..000000000000
--- a/content/canvas/test/test_2d.composite.transparent.destination-over.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.transparent.destination-over</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.transparent.source-atop.html b/content/canvas/test/test_2d.composite.transparent.source-atop.html
deleted file mode 100644
index 7e6f142852dc..000000000000
--- a/content/canvas/test/test_2d.composite.transparent.source-atop.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.transparent.source-atop</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.transparent.source-in.html b/content/canvas/test/test_2d.composite.transparent.source-in.html
deleted file mode 100644
index 80a704f8651b..000000000000
--- a/content/canvas/test/test_2d.composite.transparent.source-in.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.transparent.source-in</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.transparent.source-out.html b/content/canvas/test/test_2d.composite.transparent.source-out.html
deleted file mode 100644
index 5cd72096f80a..000000000000
--- a/content/canvas/test/test_2d.composite.transparent.source-out.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.transparent.source-out</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.transparent.source-over.html b/content/canvas/test/test_2d.composite.transparent.source-over.html
deleted file mode 100644
index a2cea80406f0..000000000000
--- a/content/canvas/test/test_2d.composite.transparent.source-over.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.transparent.source-over</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.copy.html b/content/canvas/test/test_2d.composite.uncovered.fill.copy.html
deleted file mode 100644
index 70bd121cccb5..000000000000
--- a/content/canvas/test/test_2d.composite.uncovered.fill.copy.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.uncovered.fill.copy</title>
-<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'copy';
-ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
-ctx.translate(0, 25);
-ctx.fillRect(0, 50, 100, 50);
-todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.composite.uncovered.image.copy.html b/content/canvas/test/test_2d.composite.uncovered.image.copy.html
deleted file mode 100644
index d1e677ac55ca..000000000000
--- a/content/canvas/test/test_2d.composite.uncovered.image.copy.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.uncovered.image.copy</title>
-<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'copy';
-ctx.drawImage(document.getElementById('yellow.png'), 40, 40, 10, 10, 40, 50, 10, 10)
-todo_isPixel(ctx, 15,15, 0,0,0,0, "15,15", "0,0,0,0", 5);
-todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_yellow.png" id="yellow.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.copy.html b/content/canvas/test/test_2d.composite.uncovered.pattern.copy.html
deleted file mode 100644
index 42e9fd7f40e0..000000000000
--- a/content/canvas/test/test_2d.composite.uncovered.pattern.copy.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.composite.uncovered.pattern.copy</title>
-<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'copy';
-ctx.fillStyle = ctx.createPattern(document.getElementById('yellow.png'), 'no-repeat');
-ctx.fillRect(0, 50, 100, 50);
-todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 5);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_yellow.png" id="yellow.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.3arg.html b/content/canvas/test/test_2d.drawImage.3arg.html
deleted file mode 100644
index e0aa88d42a7e..000000000000
--- a/content/canvas/test/test_2d.drawImage.3arg.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.3arg</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-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/content/canvas/test/test_2d.drawImage.5arg.html b/content/canvas/test/test_2d.drawImage.5arg.html
deleted file mode 100644
index 7cb7345919c2..000000000000
--- a/content/canvas/test/test_2d.drawImage.5arg.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.5arg</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-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/content/canvas/test/test_2d.drawImage.9arg.basic.html b/content/canvas/test/test_2d.drawImage.9arg.basic.html
deleted file mode 100644
index 100722c1eb03..000000000000
--- a/content/canvas/test/test_2d.drawImage.9arg.basic.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.9arg.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green.png" id="green.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.9arg.destpos.html b/content/canvas/test/test_2d.drawImage.9arg.destpos.html
deleted file mode 100644
index 074284c5ed84..000000000000
--- a/content/canvas/test/test_2d.drawImage.9arg.destpos.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.9arg.destpos</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-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/content/canvas/test/test_2d.drawImage.9arg.destsize.html b/content/canvas/test/test_2d.drawImage.9arg.destsize.html
deleted file mode 100644
index ed322f513df1..000000000000
--- a/content/canvas/test/test_2d.drawImage.9arg.destsize.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.9arg.destsize</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-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/content/canvas/test/test_2d.drawImage.9arg.sourcepos.html b/content/canvas/test/test_2d.drawImage.9arg.sourcepos.html
deleted file mode 100644
index 193525e4851a..000000000000
--- a/content/canvas/test/test_2d.drawImage.9arg.sourcepos.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.9arg.sourcepos</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_rgrg-256x256.png" id="rgrg-256x256.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.9arg.sourcesize.html b/content/canvas/test/test_2d.drawImage.9arg.sourcesize.html
deleted file mode 100644
index dbe8d669d803..000000000000
--- a/content/canvas/test/test_2d.drawImage.9arg.sourcesize.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.9arg.sourcesize</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_rgrg-256x256.png" id="rgrg-256x256.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.alpha.html b/content/canvas/test/test_2d.drawImage.alpha.html
deleted file mode 100644
index 4813061cf242..000000000000
--- a/content/canvas/test/test_2d.drawImage.alpha.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.alpha</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red.png" id="red.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.animated.apng.html b/content/canvas/test/test_2d.drawImage.animated.apng.html
deleted file mode 100644
index 2b2c07a68175..000000000000
--- a/content/canvas/test/test_2d.drawImage.animated.apng.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.animated.apng</title>
-<!-- Testing: drawImage() of an APNG with no poster frame draws the first frame -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function deferTest() {
-    _deferred = true;
-}
-function wrapFunction(f) {
-    return function () {
-        f.apply(null, arguments);
-        SimpleTest.finish();
-    }
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-deferTest();
-setTimeout(wrapFunction(function () {
-    ctx.drawImage(document.getElementById('anim-gr.png'), 0, 0);
-    todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-}), 500);
-
-
-});
-</script>
-<img src="image_anim-gr.png" id="anim-gr.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.animated.gif.html b/content/canvas/test/test_2d.drawImage.animated.gif.html
deleted file mode 100644
index 95d8ff924998..000000000000
--- a/content/canvas/test/test_2d.drawImage.animated.gif.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.animated.gif</title>
-<!-- Testing: drawImage() of an animated GIF draws the first frame -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function deferTest() {
-    _deferred = true;
-}
-function wrapFunction(f) {
-    return function () {
-        f.apply(null, arguments);
-        SimpleTest.finish();
-    }
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-deferTest();
-setTimeout(wrapFunction(function () {
-    ctx.drawImage(document.getElementById('anim-gr.gif'), 0, 0);
-    todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-}), 500);
-
-
-});
-</script>
-<img src="image_anim-gr.gif" id="anim-gr.gif" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.animated.poster.html b/content/canvas/test/test_2d.drawImage.animated.poster.html
deleted file mode 100644
index 275b81ead483..000000000000
--- a/content/canvas/test/test_2d.drawImage.animated.poster.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.animated.poster</title>
-<!-- Testing: drawImage() of an APNG draws the poster frame -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.drawImage(document.getElementById('anim-poster-gr.png'), 0, 0);
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_anim-poster-gr.png" id="anim-poster-gr.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.broken.html b/content/canvas/test/test_2d.drawImage.broken.html
deleted file mode 100644
index a8810f85b09a..000000000000
--- a/content/canvas/test/test_2d.drawImage.broken.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.broken</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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");
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_broken.png" id="broken.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.canvas.html b/content/canvas/test/test_2d.drawImage.canvas.html
deleted file mode 100644
index 6f83cd6fd653..000000000000
--- a/content/canvas/test/test_2d.drawImage.canvas.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.canvas</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = 100;
-canvas2.height = 50;
-var ctx2 = canvas2.getContext('2d');
-ctx2.fillStyle = '#0f0';
-ctx2.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#f00';
-ctx.drawImage(canvas2, 0, 0);
-
-isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2);
-isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
-isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
-isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.drawImage.clip.html b/content/canvas/test/test_2d.drawImage.clip.html
deleted file mode 100644
index b1bc582b19de..000000000000
--- a/content/canvas/test/test_2d.drawImage.clip.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.clip</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red.png" id="red.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.composite.html b/content/canvas/test/test_2d.drawImage.composite.html
deleted file mode 100644
index 35e708c937c5..000000000000
--- a/content/canvas/test/test_2d.drawImage.composite.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.composite</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'destination-over';
-ctx.drawImage(document.getElementById('red.png'), 0, 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red.png" id="red.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.floatsource.html b/content/canvas/test/test_2d.drawImage.floatsource.html
deleted file mode 100644
index d10cb99d4275..000000000000
--- a/content/canvas/test/test_2d.drawImage.floatsource.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.floatsource</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green.png" id="green.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.incomplete.html b/content/canvas/test/test_2d.drawImage.incomplete.html
deleted file mode 100644
index 1d795d84ef96..000000000000
--- a/content/canvas/test/test_2d.drawImage.incomplete.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.incomplete</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.drawImage.negativedest.html b/content/canvas/test/test_2d.drawImage.negativedest.html
deleted file mode 100644
index dc0efe75757a..000000000000
--- a/content/canvas/test/test_2d.drawImage.negativedest.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.negativedest</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.drawImage(document.getElementById('ggrr-256x256.png'), 100, 78, 50, 50, 0, 50, 50, -50);
-ctx.drawImage(document.getElementById('ggrr-256x256.png'), 100, 128, 50, -50, 100, 50, -50, -50);
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2);
-isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2);
-isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2);
-isPixel(ctx, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2);
-isPixel(ctx, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_ggrr-256x256.png" id="ggrr-256x256.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.negativesource.html b/content/canvas/test/test_2d.drawImage.negativesource.html
deleted file mode 100644
index 7f1f0d746729..000000000000
--- a/content/canvas/test/test_2d.drawImage.negativesource.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.negativesource</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.drawImage(document.getElementById('ggrr-256x256.png'), 100, 78, -100, 50, 0, 0, 50, 50);
-ctx.drawImage(document.getElementById('ggrr-256x256.png'), 100, 128, -100, -50, 50, 0, 50, 50);
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 2);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 2);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 2);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 2);
-isPixel(ctx, 48,1, 0,255,0,255, "48,1", "0,255,0,255", 2);
-isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 2);
-isPixel(ctx, 51,1, 0,255,0,255, "51,1", "0,255,0,255", 2);
-isPixel(ctx, 51,48, 0,255,0,255, "51,48", "0,255,0,255", 2);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_ggrr-256x256.png" id="ggrr-256x256.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.nonfinite.html b/content/canvas/test/test_2d.drawImage.nonfinite.html
deleted file mode 100644
index 64b1db1ac476..000000000000
--- a/content/canvas/test/test_2d.drawImage.nonfinite.html
+++ /dev/null
@@ -1,348 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.nonfinite</title>
-<!-- Testing: drawImage() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-var red = document.getElementById('red.png');
-ctx.drawImage(red, Infinity, 0);
-ctx.drawImage(red, -Infinity, 0);
-ctx.drawImage(red, NaN, 0);
-ctx.drawImage(red, 0, Infinity);
-ctx.drawImage(red, 0, -Infinity);
-ctx.drawImage(red, 0, NaN);
-ctx.drawImage(red, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, 50);
-ctx.drawImage(red, -Infinity, 0, 100, 50);
-ctx.drawImage(red, NaN, 0, 100, 50);
-ctx.drawImage(red, 0, Infinity, 100, 50);
-ctx.drawImage(red, 0, -Infinity, 100, 50);
-ctx.drawImage(red, 0, NaN, 100, 50);
-ctx.drawImage(red, 0, 0, Infinity, 50);
-ctx.drawImage(red, 0, 0, -Infinity, 50);
-ctx.drawImage(red, 0, 0, NaN, 50);
-ctx.drawImage(red, 0, 0, 100, Infinity);
-ctx.drawImage(red, 0, 0, 100, -Infinity);
-ctx.drawImage(red, 0, 0, 100, NaN);
-ctx.drawImage(red, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, 50, 0, 0, 100, 50);
-ctx.drawImage(red, -Infinity, 0, 100, 50, 0, 0, 100, 50);
-ctx.drawImage(red, NaN, 0, 100, 50, 0, 0, 100, 50);
-ctx.drawImage(red, 0, Infinity, 100, 50, 0, 0, 100, 50);
-ctx.drawImage(red, 0, -Infinity, 100, 50, 0, 0, 100, 50);
-ctx.drawImage(red, 0, NaN, 100, 50, 0, 0, 100, 50);
-ctx.drawImage(red, 0, 0, Infinity, 50, 0, 0, 100, 50);
-ctx.drawImage(red, 0, 0, -Infinity, 50, 0, 0, 100, 50);
-ctx.drawImage(red, 0, 0, NaN, 50, 0, 0, 100, 50);
-ctx.drawImage(red, 0, 0, 100, Infinity, 0, 0, 100, 50);
-ctx.drawImage(red, 0, 0, 100, -Infinity, 0, 0, 100, 50);
-ctx.drawImage(red, 0, 0, 100, NaN, 0, 0, 100, 50);
-ctx.drawImage(red, 0, 0, 100, 50, Infinity, 0, 100, 50);
-ctx.drawImage(red, 0, 0, 100, 50, -Infinity, 0, 100, 50);
-ctx.drawImage(red, 0, 0, 100, 50, NaN, 0, 100, 50);
-ctx.drawImage(red, 0, 0, 100, 50, 0, Infinity, 100, 50);
-ctx.drawImage(red, 0, 0, 100, 50, 0, -Infinity, 100, 50);
-ctx.drawImage(red, 0, 0, 100, 50, 0, NaN, 100, 50);
-ctx.drawImage(red, 0, 0, 100, 50, 0, 0, Infinity, 50);
-ctx.drawImage(red, 0, 0, 100, 50, 0, 0, -Infinity, 50);
-ctx.drawImage(red, 0, 0, 100, 50, 0, 0, NaN, 50);
-ctx.drawImage(red, 0, 0, 100, 50, 0, 0, 100, Infinity);
-ctx.drawImage(red, 0, 0, 100, 50, 0, 0, 100, -Infinity);
-ctx.drawImage(red, 0, 0, 100, 50, 0, 0, 100, NaN);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, 0, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, 0, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, 0, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, 0, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, 0, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, 0, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, 0, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, 0, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, 0, 100, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, 0, 100, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, 0, 100, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, 0, 100, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, 0, 100, 50);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, 0, 100, 50);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, 0, 100, 50);
-ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, 50, 0, Infinity, 100, 50);
-ctx.drawImage(red, Infinity, 0, 100, 50, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, 100, 50, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, 50, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, 50, 0, 0, Infinity, 50);
-ctx.drawImage(red, Infinity, 0, 100, 50, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, Infinity, 0, 100, 50, 0, 0, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, 0, 100, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, 0, 100, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, 0, 100, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, Infinity, 100, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, 0, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, 0, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, 0, 100, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, Infinity, 100, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, 0, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, 0, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, 0, 100, 50);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, 0, 100, 50);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, Infinity, 100, 50);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, 0, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, 0, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, 0, 100, 50);
-ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, 50, 0, Infinity, 100, 50);
-ctx.drawImage(red, 0, Infinity, 100, 50, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, 100, 50, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, 50, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, 50, 0, 0, Infinity, 50);
-ctx.drawImage(red, 0, Infinity, 100, 50, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, Infinity, 100, 50, 0, 0, 100, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, 0, 100, 50);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, 0, 100, 50);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, Infinity, 100, 50);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, 0, Infinity, 50);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, 0, 100, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, 0, 100, 50);
-ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, 50, 0, Infinity, 100, 50);
-ctx.drawImage(red, 0, 0, Infinity, 50, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, 0, Infinity, 50, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, 50, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, 50, 0, 0, Infinity, 50);
-ctx.drawImage(red, 0, 0, Infinity, 50, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, Infinity, 50, 0, 0, 100, Infinity);
-ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, 0, 100, 50);
-ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, 0, 0, 100, Infinity, 0, Infinity, 100, 50);
-ctx.drawImage(red, 0, 0, 100, Infinity, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, 0, 100, Infinity, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, 100, Infinity, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, 0, 100, Infinity, 0, 0, Infinity, 50);
-ctx.drawImage(red, 0, 0, 100, Infinity, 0, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, 100, Infinity, 0, 0, 100, Infinity);
-ctx.drawImage(red, 0, 0, 100, 50, Infinity, Infinity, 100, 50);
-ctx.drawImage(red, 0, 0, 100, 50, Infinity, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, 0, 100, 50, Infinity, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, 100, 50, Infinity, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, 0, 100, 50, Infinity, 0, Infinity, 50);
-ctx.drawImage(red, 0, 0, 100, 50, Infinity, 0, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, 100, 50, Infinity, 0, 100, Infinity);
-ctx.drawImage(red, 0, 0, 100, 50, 0, Infinity, Infinity, 50);
-ctx.drawImage(red, 0, 0, 100, 50, 0, Infinity, Infinity, Infinity);
-ctx.drawImage(red, 0, 0, 100, 50, 0, Infinity, 100, Infinity);
-ctx.drawImage(red, 0, 0, 100, 50, 0, 0, Infinity, Infinity);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red.png" id="red.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.nowrap.html b/content/canvas/test/test_2d.drawImage.nowrap.html
deleted file mode 100644
index 19a9a70c35b0..000000000000
--- a/content/canvas/test/test_2d.drawImage.nowrap.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.nowrap</title>
-<!-- Testing: Stretched images do not get pixels wrapping around the edges -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.drawImage(document.getElementById('redtransparent.png'), -1950, 0, 2000, 50);
-isPixel(ctx, 45,25, 0,255,0,255, "45,25", "0,255,0,255", 2);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-isPixel(ctx, 55,25, 0,255,0,255, "55,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_redtransparent.png" id="redtransparent.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.null.html b/content/canvas/test/test_2d.drawImage.null.html
deleted file mode 100644
index 52da33324c8b..000000000000
--- a/content/canvas/test/test_2d.drawImage.null.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.null</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.drawImage(null, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.drawImage.outsidesource.html b/content/canvas/test/test_2d.drawImage.outsidesource.html
deleted file mode 100644
index 53946417ee55..000000000000
--- a/content/canvas/test/test_2d.drawImage.outsidesource.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.outsidesource</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.drawImage(document.getElementById('green.png'), 10.5, 10.5, 89.5, 39.5, 0, 0, 100, 50);
-ctx.drawImage(document.getElementById('green.png'), 5.5, 5.5, -5.5, -5.5, 0, 0, 100, 50);
-ctx.drawImage(document.getElementById('green.png'), 100, 50, -5, -5, 0, 0, 100, 50);
-var _thrown = undefined; try {
-  ctx.drawImage(document.getElementById('red.png'), -0.001, 0, 100, 50, 0, 0, 100, 50);
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-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");
-var _thrown = undefined; try {
-  ctx.drawImage(document.getElementById('red.png'), 0, 0, -5, 5, 0, 0, 100, 50);
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-var _thrown = undefined; try {
-  ctx.drawImage(document.getElementById('red.png'), 0, 0, 5, -5, 0, 0, 100, 50);
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-var _thrown = undefined; try {
-  ctx.drawImage(document.getElementById('red.png'), 110, 60, -20, -20, 0, 0, 100, 50);
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green.png" id="green.png" class="resource">
-<img src="image_red.png" id="red.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.path.html b/content/canvas/test/test_2d.drawImage.path.html
deleted file mode 100644
index 45a7537fd68f..000000000000
--- a/content/canvas/test/test_2d.drawImage.path.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.path</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red.png" id="red.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.self.1.html b/content/canvas/test/test_2d.drawImage.self.1.html
deleted file mode 100644
index 844244e672d3..000000000000
--- a/content/canvas/test/test_2d.drawImage.self.1.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.self.1 - bug 433235</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 50, 50);
-ctx.fillStyle = '#f00';
-ctx.fillRect(50, 0, 50, 50);
-ctx.drawImage(canvas, 50, 0);
-
-isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2);
-isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
-isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
-isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.drawImage.self.2.html b/content/canvas/test/test_2d.drawImage.self.2.html
deleted file mode 100644
index 53f9bc3df457..000000000000
--- a/content/canvas/test/test_2d.drawImage.self.2.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.self.2 - bug 433235</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 1, 100, 49);
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 1);
-ctx.drawImage(canvas, 0, 1);
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 2);
-
-isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 2);
-isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 2);
-isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 2);
-isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.drawImage.transform.html b/content/canvas/test/test_2d.drawImage.transform.html
deleted file mode 100644
index edd5e0470774..000000000000
--- a/content/canvas/test/test_2d.drawImage.transform.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.transform</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red.png" id="red.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.drawImage.wrongtype.html b/content/canvas/test/test_2d.drawImage.wrongtype.html
deleted file mode 100644
index 219efbfd4c0f..000000000000
--- a/content/canvas/test/test_2d.drawImage.wrongtype.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.wrongtype</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.drawImage.zerosource.html b/content/canvas/test/test_2d.drawImage.zerosource.html
deleted file mode 100644
index 9ba5b32c3603..000000000000
--- a/content/canvas/test/test_2d.drawImage.zerosource.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.drawImage.zerosource</title>
-<!-- Testing: drawImage with zero-sized source rectangle throws INDEX_SIZE_ERR -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-var _thrown = undefined; try {
-  ctx.drawImage(document.getElementById('red.png'), 10, 10, 0, 1, 0, 0, 100, 50);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-var _thrown = undefined; try {
-  ctx.drawImage(document.getElementById('red.png'), 10, 10, 1, 0, 0, 0, 100, 50);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-var _thrown = undefined; try {
-  ctx.drawImage(document.getElementById('red.png'), 10, 10, 0, 0, 0, 0, 100, 50);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red.png" id="red.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.fillRect.basic.html b/content/canvas/test/test_2d.fillRect.basic.html
deleted file mode 100644
index 2b8d12cfa20d..000000000000
--- a/content/canvas/test/test_2d.fillRect.basic.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillRect.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillRect.clip.html b/content/canvas/test/test_2d.fillRect.clip.html
deleted file mode 100644
index c1807e89c67b..000000000000
--- a/content/canvas/test/test_2d.fillRect.clip.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillRect.clip</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.beginPath();
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillRect.negative.html b/content/canvas/test/test_2d.fillRect.negative.html
deleted file mode 100644
index 6cdd766d4fbb..000000000000
--- a/content/canvas/test/test_2d.fillRect.negative.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillRect.negative</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 50, 25);
-ctx.fillRect(100, 0, -50, 25);
-ctx.fillRect(0, 50, 50, -25);
-ctx.fillRect(100, 50, -50, -25);
-isPixel(ctx, 25,12, 0,255,0,255, "25,12", "0,255,0,255", 0);
-isPixel(ctx, 75,12, 0,255,0,255, "75,12", "0,255,0,255", 0);
-isPixel(ctx, 25,37, 0,255,0,255, "25,37", "0,255,0,255", 0);
-isPixel(ctx, 75,37, 0,255,0,255, "75,37", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillRect.nonfinite.html b/content/canvas/test/test_2d.fillRect.nonfinite.html
deleted file mode 100644
index e2358dfc2f01..000000000000
--- a/content/canvas/test/test_2d.fillRect.nonfinite.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillRect.nonfinite</title>
-<!-- Testing: fillRect() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(Infinity, 0, 100, 50);
-ctx.fillRect(-Infinity, 0, 100, 50);
-ctx.fillRect(NaN, 0, 100, 50);
-ctx.fillRect(0, Infinity, 100, 50);
-ctx.fillRect(0, -Infinity, 100, 50);
-ctx.fillRect(0, NaN, 100, 50);
-ctx.fillRect(0, 0, Infinity, 50);
-ctx.fillRect(0, 0, -Infinity, 50);
-ctx.fillRect(0, 0, NaN, 50);
-ctx.fillRect(0, 0, 100, Infinity);
-ctx.fillRect(0, 0, 100, -Infinity);
-ctx.fillRect(0, 0, 100, NaN);
-ctx.fillRect(Infinity, Infinity, 100, 50);
-ctx.fillRect(Infinity, Infinity, Infinity, 50);
-ctx.fillRect(Infinity, Infinity, Infinity, Infinity);
-ctx.fillRect(Infinity, Infinity, 100, Infinity);
-ctx.fillRect(Infinity, 0, Infinity, 50);
-ctx.fillRect(Infinity, 0, Infinity, Infinity);
-ctx.fillRect(Infinity, 0, 100, Infinity);
-ctx.fillRect(0, Infinity, Infinity, 50);
-ctx.fillRect(0, Infinity, Infinity, Infinity);
-ctx.fillRect(0, Infinity, 100, Infinity);
-ctx.fillRect(0, 0, Infinity, Infinity);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillRect.path.html b/content/canvas/test/test_2d.fillRect.path.html
deleted file mode 100644
index caeba5bb6da2..000000000000
--- a/content/canvas/test/test_2d.fillRect.path.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillRect.path</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillRect.shadow.html b/content/canvas/test/test_2d.fillRect.shadow.html
deleted file mode 100644
index 22643533a7d3..000000000000
--- a/content/canvas/test/test_2d.fillRect.shadow.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillRect.shadow</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#f00';
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillRect.transform.html b/content/canvas/test/test_2d.fillRect.transform.html
deleted file mode 100644
index 720cda02807b..000000000000
--- a/content/canvas/test/test_2d.fillRect.transform.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillRect.transform</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillRect.zero.html b/content/canvas/test/test_2d.fillRect.zero.html
deleted file mode 100644
index 93c75483fa9c..000000000000
--- a/content/canvas/test/test_2d.fillRect.zero.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillRect.zero</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 0);
-ctx.fillRect(0, 0, 0, 50);
-ctx.fillRect(0, 0, 0, 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.default.html b/content/canvas/test/test_2d.fillStyle.default.html
deleted file mode 100644
index d9337dab57f1..000000000000
--- a/content/canvas/test/test_2d.fillStyle.default.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.default</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(ctx.fillStyle == '#000000', "ctx.fillStyle == '#000000'");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.get.semitransparent.html b/content/canvas/test/test_2d.fillStyle.get.semitransparent.html
deleted file mode 100644
index da1ded37e7f3..000000000000
--- a/content/canvas/test/test_2d.fillStyle.get.semitransparent.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.get.semitransparent</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '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+\\)$/");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.get.solid.html b/content/canvas/test/test_2d.fillStyle.get.solid.html
deleted file mode 100644
index 42a467048a4e..000000000000
--- a/content/canvas/test/test_2d.fillStyle.get.solid.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.get.solid</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#fa0';
-ok(ctx.fillStyle === '#ffaa00', "ctx.fillStyle === '#ffaa00'");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.get.transparent.html b/content/canvas/test/test_2d.fillStyle.get.transparent.html
deleted file mode 100644
index 6a09b271c2d7..000000000000
--- a/content/canvas/test/test_2d.fillStyle.get.transparent.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.get.transparent</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = 'rgba(0,0,0,0)';
-ok(ctx.fillStyle == 'rgba(0, 0, 0, 0.0)', "ctx.fillStyle == 'rgba(0, 0, 0, 0.0)'");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.invalidstring.html b/content/canvas/test/test_2d.fillStyle.invalidstring.html
deleted file mode 100644
index 481030beea09..000000000000
--- a/content/canvas/test/test_2d.fillStyle.invalidstring.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.invalidstring</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0f0';
-ctx.fillStyle = 'invalid';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.invalidtype.html b/content/canvas/test/test_2d.fillStyle.invalidtype.html
deleted file mode 100644
index 76d7e20b3f5c..000000000000
--- a/content/canvas/test/test_2d.fillStyle.invalidtype.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.invalidtype</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0f0';
-ctx.fillStyle = null;
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.current.basic.html b/content/canvas/test/test_2d.fillStyle.parse.current.basic.html
deleted file mode 100644
index 6e42419b8705..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.current.basic.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.current.basic</title>
-<!-- Testing: currentColor is computed from the canvas element -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-canvas.setAttribute('style', 'color: #0f0');
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'currentColor';
-ctx.fillRect(0, 0, 100, 50);
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.current.changed.html b/content/canvas/test/test_2d.fillStyle.parse.current.changed.html
deleted file mode 100644
index 28e868619ed0..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.current.changed.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.current.changed</title>
-<!-- Testing: currentColor is computed when the attribute is set, not when it is painted -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-canvas.setAttribute('style', 'color: #0f0');
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'currentColor';
-canvas.setAttribute('style', 'color: #f00');
-ctx.fillRect(0, 0, 100, 50);
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.current.removed.html b/content/canvas/test/test_2d.fillStyle.parse.current.removed.html
deleted file mode 100644
index 29a52f658123..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.current.removed.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.current.removed</title>
-<!-- Testing: currentColor is solid black when the canvas element is not in a document -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// Try not to let it undetectably incorrectly pick up opaque-black
-// from other parts of the document:
-document.body.parentNode.setAttribute('style', 'color: #f00');
-document.body.setAttribute('style', 'color: #f00');
-canvas.setAttribute('style', 'color: #f00');
-
-var canvas2 = document.createElement('canvas');
-var ctx2 = canvas2.getContext('2d');
-ctx2.fillStyle = '#f00';
-ctx2.fillStyle = 'currentColor';
-ctx2.fillRect(0, 0, 100, 50);
-ctx.drawImage(canvas2, 0, 0);
-
-document.body.parentNode.removeAttribute('style');
-document.body.removeAttribute('style');
-
-todo_isPixel(ctx, 50,25, 0,0,0,255, "50,25", "0,0,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hex3.html b/content/canvas/test/test_2d.fillStyle.parse.hex3.html
deleted file mode 100644
index 81409c8777cf..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hex3.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hex3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hex6.html b/content/canvas/test/test_2d.fillStyle.parse.hex6.html
deleted file mode 100644
index ce27e99bb309..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hex6.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hex6</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = '#00fF00';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-1.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-1.html
deleted file mode 100644
index 14803923e4fd..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsl-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsl-1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsl(120, 100%, 50%)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-2.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-2.html
deleted file mode 100644
index f1f64ed742a5..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsl-2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsl-2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsl( -240 , 100% , 50% )';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-3.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-3.html
deleted file mode 100644
index 5e3563c4f07d..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsl-3.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsl-3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsl(360120, 100%, 50%)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-4.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-4.html
deleted file mode 100644
index ae7cd31924fd..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsl-4.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsl-4</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsl(-360240, 100%, 50%)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-5.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-5.html
deleted file mode 100644
index c2e13ec9c3f7..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsl-5.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsl-5</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsl(120.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-1.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-1.html
deleted file mode 100644
index 1abb6117328a..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsl-clamp-1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsl(120, 200%, 50%)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-2.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-2.html
deleted file mode 100644
index e7416552b95b..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsl-clamp-2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsl(120, -200%, 49.9%)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-3.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-3.html
deleted file mode 100644
index d111de84f53e..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-3.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsl-clamp-3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsl(120, 100%, 200%)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 255,255,255,255, "50,25", "255,255,255,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-4.html b/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-4.html
deleted file mode 100644
index 7197b2ad1565..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsl-clamp-4.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsl-clamp-4</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsl(120, 100%, -200%)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,0,0,255, "50,25", "0,0,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-1.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-1.html
deleted file mode 100644
index 70cef7e5ebac..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsla-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsla-1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsla(120, 100%, 50%, 0.499)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,127, "50,25", "0,255,0,127", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-2.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-2.html
deleted file mode 100644
index 955b19b7547b..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsla-2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsla-2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsla( 120.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-1.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-1.html
deleted file mode 100644
index 5e4afeb018dc..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsla-clamp-1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsla(120, 200%, 50%, 1)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-2.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-2.html
deleted file mode 100644
index 2cc115cd0d44..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsla-clamp-2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsla(120, -200%, 49.9%, 1)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-3.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-3.html
deleted file mode 100644
index c70a4ad4efad..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-3.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsla-clamp-3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsla(120, 100%, 200%, 1)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 255,255,255,255, "50,25", "255,255,255,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-4.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-4.html
deleted file mode 100644
index 98ce90a971bb..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-4.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsla-clamp-4</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsla(120, 100%, -200%, 1)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,0,0,255, "50,25", "0,0,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-5.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-5.html
deleted file mode 100644
index 80da2d263b07..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-5.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsla-clamp-5</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsla(120, 100%, 50%, 2)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-6.html b/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-6.html
deleted file mode 100644
index 0cc9298c7fcf..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.hsla-clamp-6.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.hsla-clamp-6</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'hsla(120, 100%, 0%, -2)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.html4.html b/content/canvas/test/test_2d.fillStyle.parse.html4.html
deleted file mode 100644
index e3cb2d90ef98..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.html4.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.html4</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'limE';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hex3.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hex3.html
deleted file mode 100644
index 105304c9d75d..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hex3.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.hex3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = '#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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hex6.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hex6.html
deleted file mode 100644
index 6aee91c9844f..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hex6.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.hex6</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = '#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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-1.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-1.html
deleted file mode 100644
index 9362a8a689ed..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.hsl-1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = 'hsl(0%, 100%, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-2.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-2.html
deleted file mode 100644
index 4a8c80bc7a45..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.hsl-2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = 'hsl(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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-3.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-3.html
deleted file mode 100644
index 1dbceeb6e6b1..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-3.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.hsl-3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = 'hsl(0, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-4.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-4.html
deleted file mode 100644
index 3130c303d970..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-4.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.hsl-4</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = 'hsl(0, 100%, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-5.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-5.html
deleted file mode 100644
index d6894b76f2e8..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsl-5.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.hsl-5</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = 'hsl(0, 100%, 100%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsla-1.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsla-1.html
deleted file mode 100644
index c6153d1e62cb..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsla-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.hsla-1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = 'hsla(0%, 100%, 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsla-2.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.hsla-2.html
deleted file mode 100644
index 5b2bded776bf..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.hsla-2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.hsla-2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = 'hsla(0, 0, 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-1.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-1.html
deleted file mode 100644
index 19395fb08f03..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.rgb-1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = 'rgb(255.0, 0, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-2.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-2.html
deleted file mode 100644
index 7e2bebaaf9d2..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.rgb-2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = 'rgb(255, 0.0, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-3.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-3.html
deleted file mode 100644
index 57f5ec9f8a7c..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-3.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.rgb-3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = 'rgb(255.0, 0, 0,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-4.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-4.html
deleted file mode 100644
index c42e0ba512d8..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-4.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.rgb-4</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = 'rgb(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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-5.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-5.html
deleted file mode 100644
index 7c0bc706f687..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-5.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.rgb-5</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = 'rgb(255 0 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-6.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-6.html
deleted file mode 100644
index f69ea6c8685f..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-6.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.rgb-6</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = 'rgb(255, - 1, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-7.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-7.html
deleted file mode 100644
index 090edfd73e5e..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgb-7.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.rgb-7</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = 'rgb(255, 0, 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-1.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-1.html
deleted file mode 100644
index ee823cd803e0..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.rgba-1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-2.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-2.html
deleted file mode 100644
index 10e985007bd3..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.rgba-2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-3.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-3.html
deleted file mode 100644
index 96b7c0016439..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-3.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.rgba-3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-4.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-4.html
deleted file mode 100644
index 7f85707d9667..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-4.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.rgba-4</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-5.html b/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-5.html
deleted file mode 100644
index ed4e5b845ee4..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.invalid.rgba-5.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.invalid.rgba-5</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#0f0';
-try { ctx.fillStyle = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-1.html b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-1.html
deleted file mode 100644
index e87560e4916d..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.rgb-clamp-1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'rgb(-1000, 1000, -1000)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-2.html b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-2.html
deleted file mode 100644
index 01429c9399d7..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.rgb-clamp-2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'rgb(-200%, 200%, -200%)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-3.html b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-3.html
deleted file mode 100644
index e54e33586029..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-3.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.rgb-clamp-3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'rgb(-2147483649, 4294967298, -18446744073709551619)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-4.html b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-4.html
deleted file mode 100644
index d75c078a9be8..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-4.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.rgb-clamp-4</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'rgb(-1000000000000000000000000000000000000000, 1000000000000000000000000000000000000000, -1000000000000000000000000000000000000000)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-5.html b/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-5.html
deleted file mode 100644
index 8fac57aa9cb8..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.rgb-clamp-5.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.rgb-clamp-5</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'rgb(-10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, -10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgb-num.html b/content/canvas/test/test_2d.fillStyle.parse.rgb-num.html
deleted file mode 100644
index ed31bb62e243..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.rgb-num.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.rgb-num</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'rgb(0,255,0)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgb-percent.html b/content/canvas/test/test_2d.fillStyle.parse.rgb-percent.html
deleted file mode 100644
index 8a86b37e444c..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.rgb-percent.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.rgb-percent</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'rgb(0% ,100% ,0%)';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-1.html b/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-1.html
deleted file mode 100644
index b0281d678ea3..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.rgba-clamp-1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-2.html b/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-2.html
deleted file mode 100644
index a041d08121d5..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.rgba-clamp-2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.rgba-clamp-2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgba-num-1.html b/content/canvas/test/test_2d.fillStyle.parse.rgba-num-1.html
deleted file mode 100644
index 5f142dff65ab..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.rgba-num-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.rgba-num-1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgba-num-2.html b/content/canvas/test/test_2d.fillStyle.parse.rgba-num-2.html
deleted file mode 100644
index 77e574e0cc7d..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.rgba-num-2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.rgba-num-2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgba-percent.html b/content/canvas/test/test_2d.fillStyle.parse.rgba-percent.html
deleted file mode 100644
index bde126a77f58..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.rgba-percent.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.rgba-percent</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-1.html b/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-1.html
deleted file mode 100644
index a0efc3de0d88..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.rgba-solid-1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-2.html b/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-2.html
deleted file mode 100644
index a81990c2e3e2..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.rgba-solid-2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.rgba-solid-2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = '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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.svg-1.html b/content/canvas/test/test_2d.fillStyle.parse.svg-1.html
deleted file mode 100644
index b3b8e947b5da..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.svg-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.svg-1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'gray';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 128,128,128,255, "50,25", "128,128,128,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.svg-2.html b/content/canvas/test/test_2d.fillStyle.parse.svg-2.html
deleted file mode 100644
index 9963726c06e0..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.svg-2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.svg-2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'grey';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 128,128,128,255, "50,25", "128,128,128,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.system.html b/content/canvas/test/test_2d.fillStyle.parse.system.html
deleted file mode 100644
index 732f7bca0ef1..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.system.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.system</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'ThreeDDarkShadow';
-ok(ctx.fillStyle =~ /^#(?!(FF0000|ff0000|f00)$)/, "ctx.fillStyle =~ /^#(?!(FF0000|ff0000|f00)$)/"); // test that it's not red
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.transparent-1.html b/content/canvas/test/test_2d.fillStyle.parse.transparent-1.html
deleted file mode 100644
index 1dc2d884ee8c..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.transparent-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.transparent-1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'transparent';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.fillStyle.parse.transparent-2.html b/content/canvas/test/test_2d.fillStyle.parse.transparent-2.html
deleted file mode 100644
index a96d8ec8e056..000000000000
--- a/content/canvas/test/test_2d.fillStyle.parse.transparent-2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.fillStyle.parse.transparent-2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-
-ctx.fillStyle = '#f00';
-ctx.fillStyle = 'TrAnSpArEnT';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.getcontext.exists.html b/content/canvas/test/test_2d.getcontext.exists.html
deleted file mode 100644
index f5a43b9f739e..000000000000
--- a/content/canvas/test/test_2d.getcontext.exists.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.getcontext.exists</title>
-<!-- Testing: The 2D context is implemented -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(canvas.getContext('2d') !== null, "canvas.getContext('2d') !== null");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.getcontext.shared.html b/content/canvas/test/test_2d.getcontext.shared.html
deleted file mode 100644
index 126bea9401cf..000000000000
--- a/content/canvas/test/test_2d.getcontext.shared.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.getcontext.shared</title>
-<!-- Testing: getContext('2d') returns objects which share canvas state -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.getcontext.unique.html b/content/canvas/test/test_2d.getcontext.unique.html
deleted file mode 100644
index 1f6a5a99b84c..000000000000
--- a/content/canvas/test/test_2d.getcontext.unique.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.getcontext.unique</title>
-<!-- Testing: getContext('2d') returns the same object -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(canvas.getContext('2d') === canvas.getContext('2d'), "canvas.getContext('2d') === canvas.getContext('2d')");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.empty.html b/content/canvas/test/test_2d.gradient.empty.html
deleted file mode 100644
index e1e7bc40484c..000000000000
--- a/content/canvas/test/test_2d.gradient.empty.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.empty</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.interpolate.alpha.html b/content/canvas/test/test_2d.gradient.interpolate.alpha.html
deleted file mode 100644
index 61a9d3248b8e..000000000000
--- a/content/canvas/test/test_2d.gradient.interpolate.alpha.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.interpolate.alpha</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#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", 3);
-isPixel(ctx, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3);
-isPixel(ctx, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.interpolate.colour.html b/content/canvas/test/test_2d.gradient.interpolate.colour.html
deleted file mode 100644
index c530f8e68827..000000000000
--- a/content/canvas/test/test_2d.gradient.interpolate.colour.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.interpolate.colour</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var g = ctx.createLinearGradient(0, 0, 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", 3);
-isPixel(ctx, 50,25, 127,127,127,255, "50,25", "127,127,127,255", 3);
-isPixel(ctx, 75,25, 63,63,191,255, "75,25", "63,63,191,255", 3);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.interpolate.colouralpha.html b/content/canvas/test/test_2d.gradient.interpolate.colouralpha.html
deleted file mode 100644
index af722e1c3ae3..000000000000
--- a/content/canvas/test/test_2d.gradient.interpolate.colouralpha.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.interpolate.colouralpha</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var g = ctx.createLinearGradient(0, 0, 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", 3);
-isPixel(ctx, 50,25, 127,127,127,127, "50,25", "127,127,127,127", 3);
-isPixel(ctx, 75,25, 63,63,191,191, "75,25", "63,63,191,191", 3);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.interpolate.multiple.html b/content/canvas/test/test_2d.gradient.interpolate.multiple.html
deleted file mode 100644
index 08d25eeb6578..000000000000
--- a/content/canvas/test/test_2d.gradient.interpolate.multiple.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.interpolate.multiple</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-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", 3);
-isPixel(ctx, 100,25, 0,255,255,255, "100,25", "0,255,255,255", 3);
-isPixel(ctx, 150,25, 127,127,255,255, "150,25", "127,127,255,255", 3);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.interpolate.outside.html b/content/canvas/test/test_2d.gradient.interpolate.outside.html
deleted file mode 100644
index 15f8211e22c5..000000000000
--- a/content/canvas/test/test_2d.gradient.interpolate.outside.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.interpolate.outside</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.interpolate.overlap.html b/content/canvas/test/test_2d.gradient.interpolate.overlap.html
deleted file mode 100644
index 3f802022181b..000000000000
--- a/content/canvas/test/test_2d.gradient.interpolate.overlap.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.interpolate.overlap</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.interpolate.overlap2.html b/content/canvas/test/test_2d.gradient.interpolate.overlap2.html
deleted file mode 100644
index 75f41a471b44..000000000000
--- a/content/canvas/test/test_2d.gradient.interpolate.overlap2.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.interpolate.overlap2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var g = ctx.createLinearGradient(0, 0, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.interpolate.solid.html b/content/canvas/test/test_2d.gradient.interpolate.solid.html
deleted file mode 100644
index 040ea945923e..000000000000
--- a/content/canvas/test/test_2d.gradient.interpolate.solid.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.interpolate.solid</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var g = ctx.createLinearGradient(0, 0, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.interpolate.vertical.html b/content/canvas/test/test_2d.gradient.interpolate.vertical.html
deleted file mode 100644
index 4da0d5c73dfc..000000000000
--- a/content/canvas/test/test_2d.gradient.interpolate.vertical.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.interpolate.vertical</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var g = ctx.createLinearGradient(0, 0, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.interpolate.zerosize.html b/content/canvas/test/test_2d.gradient.interpolate.zerosize.html
deleted file mode 100644
index 865e243e3b18..000000000000
--- a/content/canvas/test/test_2d.gradient.interpolate.zerosize.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.interpolate.zerosize</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-var g = ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.linear.nonfinite.html b/content/canvas/test/test_2d.gradient.linear.nonfinite.html
deleted file mode 100644
index 5c8b79d708f8..000000000000
--- a/content/canvas/test/test_2d.gradient.linear.nonfinite.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.linear.nonfinite</title>
-<!-- Testing: createLinearGradient() throws NOT_SUPPORTED_ERR if arguments are not finite -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.createLinearGradient(Infinity, 0, 1, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(-Infinity, 0, 1, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(NaN, 0, 1, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, Infinity, 1, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, -Infinity, 1, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, NaN, 1, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, 0, Infinity, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, 0, -Infinity, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, 0, NaN, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, 0, 1, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, 0, 1, -Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, 0, 1, NaN);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(Infinity, Infinity, 1, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(Infinity, Infinity, Infinity, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(Infinity, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(Infinity, Infinity, 1, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(Infinity, 0, Infinity, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(Infinity, 0, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(Infinity, 0, 1, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, Infinity, Infinity, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, Infinity, 1, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, 0, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.linear.transform.1.html b/content/canvas/test/test_2d.gradient.linear.transform.1.html
deleted file mode 100644
index b7fa474497ea..000000000000
--- a/content/canvas/test/test_2d.gradient.linear.transform.1.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.linear.transform.1</title>
-<!-- Testing: Linear gradient coordinates are relative to the coordinate space at the time of filling -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var g = ctx.createLinearGradient(0, 0, 200, 0);
-g.addColorStop(0, '#f00');
-g.addColorStop(0.25, '#0f0');
-g.addColorStop(0.75, '#0f0');
-g.addColorStop(1, '#f00');
-ctx.fillStyle = g;
-ctx.translate(-50, 0);
-ctx.fillRect(50, 0, 100, 50);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.linear.transform.2.html b/content/canvas/test/test_2d.gradient.linear.transform.2.html
deleted file mode 100644
index 98dc8220cf28..000000000000
--- a/content/canvas/test/test_2d.gradient.linear.transform.2.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.linear.transform.2</title>
-<!-- Testing: Linear gradient coordinates are relative to the coordinate space at the time of filling -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.translate(100, 0);
-var g = ctx.createLinearGradient(0, 0, 200, 0);
-g.addColorStop(0, '#f00');
-g.addColorStop(0.25, '#0f0');
-g.addColorStop(0.75, '#0f0');
-g.addColorStop(1, '#f00');
-ctx.fillStyle = g;
-ctx.translate(-150, 0);
-ctx.fillRect(50, 0, 100, 50);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.linear.transform.3.html b/content/canvas/test/test_2d.gradient.linear.transform.3.html
deleted file mode 100644
index 796a23357f5e..000000000000
--- a/content/canvas/test/test_2d.gradient.linear.transform.3.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.linear.transform.3</title>
-<!-- Testing: Linear gradient transforms do not experience broken caching effects -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var g = ctx.createLinearGradient(0, 0, 200, 0);
-g.addColorStop(0, '#f00');
-g.addColorStop(0.25, '#0f0');
-g.addColorStop(0.75, '#0f0');
-g.addColorStop(1, '#f00');
-ctx.fillStyle = g;
-ctx.fillRect(0, 0, 100, 50);
-ctx.translate(-50, 0);
-ctx.fillRect(50, 0, 100, 50);
-todo_isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.object.compare.html b/content/canvas/test/test_2d.gradient.object.compare.html
deleted file mode 100644
index e8131b0fdea2..000000000000
--- a/content/canvas/test/test_2d.gradient.object.compare.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.object.compare</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.object.crosscanvas.html b/content/canvas/test/test_2d.gradient.object.crosscanvas.html
deleted file mode 100644
index ae84fbaff121..000000000000
--- a/content/canvas/test/test_2d.gradient.object.crosscanvas.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.object.crosscanvas</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.object.invalidcolour.html b/content/canvas/test/test_2d.gradient.object.invalidcolour.html
deleted file mode 100644
index 27d7a09783d2..000000000000
--- a/content/canvas/test/test_2d.gradient.object.invalidcolour.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.object.invalidcolour</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.object.invalidoffset.html b/content/canvas/test/test_2d.gradient.object.invalidoffset.html
deleted file mode 100644
index 2a27732b4310..000000000000
--- a/content/canvas/test/test_2d.gradient.object.invalidoffset.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.object.invalidoffset</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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.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.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-var _thrown = undefined; try {
-  g.addColorStop(NaN, '#000');
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.object.return.html b/content/canvas/test/test_2d.gradient.object.return.html
deleted file mode 100644
index 04908e0929ef..000000000000
--- a/content/canvas/test/test_2d.gradient.object.return.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.object.return</title>
-<!-- Testing: createLinearGradient() and createRadialGradient() returns objects implementing CanvasGradient -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-window.CanvasGradient.prototype.thisImplementsCanvasGradient = true;
-
-var g1 = ctx.createLinearGradient(0, 0, 100, 0);
-ok(g1.addColorStop !== undefined, "g1.addColorStop !== undefined");
-ok(g1.thisImplementsCanvasGradient === true, "g1.thisImplementsCanvasGradient === true");
-
-var g2 = ctx.createRadialGradient(0, 0, 10, 0, 0, 20);
-ok(g2.addColorStop !== undefined, "g2.addColorStop !== undefined");
-ok(g2.thisImplementsCanvasGradient === true, "g2.thisImplementsCanvasGradient === true");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.object.type.html b/content/canvas/test/test_2d.gradient.object.type.html
deleted file mode 100644
index 44b5f7fcb818..000000000000
--- a/content/canvas/test/test_2d.gradient.object.type.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.object.type</title>
-<!-- Testing: window.CanvasGradient exists and has the right properties -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(window.CanvasGradient !== undefined, "window.CanvasGradient !== undefined");
-ok(window.CanvasGradient.prototype.addColorStop !== undefined, "window.CanvasGradient.prototype.addColorStop !== undefined");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.object.update.html b/content/canvas/test/test_2d.gradient.object.update.html
deleted file mode 100644
index 58dbe1d17b6c..000000000000
--- a/content/canvas/test/test_2d.gradient.object.update.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.object.update</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var g = ctx.createLinearGradient(-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.bottom.html b/content/canvas/test/test_2d.gradient.radial.cone.bottom.html
deleted file mode 100644
index b4c5877afd68..000000000000
--- a/content/canvas/test/test_2d.gradient.radial.cone.bottom.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.radial.cone.bottom</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.cylinder.html b/content/canvas/test/test_2d.gradient.radial.cone.cylinder.html
deleted file mode 100644
index 8e6a10c1576c..000000000000
--- a/content/canvas/test/test_2d.gradient.radial.cone.cylinder.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.radial.cone.cylinder</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.radial.cone.shape1.html b/content/canvas/test/test_2d.gradient.radial.cone.shape1.html
deleted file mode 100644
index e5a0fbb4437e..000000000000
--- a/content/canvas/test/test_2d.gradient.radial.cone.shape1.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.radial.cone.shape1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.radial.inside1.html b/content/canvas/test/test_2d.gradient.radial.inside1.html
deleted file mode 100644
index 4a77e9284eeb..000000000000
--- a/content/canvas/test/test_2d.gradient.radial.inside1.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.radial.inside1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.radial.negative.html b/content/canvas/test/test_2d.gradient.radial.negative.html
deleted file mode 100644
index 49670a2dfc9a..000000000000
--- a/content/canvas/test/test_2d.gradient.radial.negative.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.radial.negative</title>
-<!-- Testing: createRadialGradient() throws INDEX_SIZE_ERR if either radius is negative -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.createRadialGradient(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");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, -0.1, 0, 0, -0.1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.radial.nonfinite.html b/content/canvas/test/test_2d.gradient.radial.nonfinite.html
deleted file mode 100644
index cfa8877a64ea..000000000000
--- a/content/canvas/test/test_2d.gradient.radial.nonfinite.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.radial.nonfinite</title>
-<!-- Testing: createRadialGradient() throws NOT_SUPPORTED_ERR if arguments are not finite -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, 1, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(-Infinity, 0, 1, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(NaN, 0, 1, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, 1, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, -Infinity, 1, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, NaN, 1, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, Infinity, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, -Infinity, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, NaN, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, Infinity, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, -Infinity, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, NaN, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, 0, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, 0, -Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, 0, NaN, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, 0, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, 0, 0, -Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, 0, 0, NaN);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, 1, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, Infinity, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, Infinity, Infinity, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, Infinity, Infinity, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, Infinity, Infinity, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, Infinity, 0, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, Infinity, 0, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, Infinity, 0, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, 1, Infinity, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, 1, Infinity, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, 1, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, 1, Infinity, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, 1, 0, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, 1, 0, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, Infinity, 1, 0, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, Infinity, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, Infinity, Infinity, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, Infinity, Infinity, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, Infinity, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, Infinity, Infinity, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, Infinity, 0, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, Infinity, 0, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, Infinity, 0, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, 1, Infinity, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, 1, Infinity, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, 1, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, 1, Infinity, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, 1, 0, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, 1, 0, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(Infinity, 0, 1, 0, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, Infinity, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, Infinity, Infinity, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, Infinity, Infinity, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, Infinity, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, Infinity, Infinity, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, Infinity, 0, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, Infinity, 0, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, Infinity, 0, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, 1, Infinity, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, 1, Infinity, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, 1, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, 1, Infinity, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, 1, 0, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, 1, 0, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, Infinity, 1, 0, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, Infinity, Infinity, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, Infinity, Infinity, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, Infinity, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, Infinity, Infinity, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, Infinity, 0, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, Infinity, 0, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, Infinity, 0, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, Infinity, Infinity, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, Infinity, 0, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, 0, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.radial.transform.1.html b/content/canvas/test/test_2d.gradient.radial.transform.1.html
deleted file mode 100644
index c19b5d859995..000000000000
--- a/content/canvas/test/test_2d.gradient.radial.transform.1.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.radial.transform.1</title>
-<!-- Testing: Radial gradient coordinates are relative to the coordinate space at the time of filling -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2);
-g.addColorStop(0, '#0f0');
-g.addColorStop(0.5, '#0f0');
-g.addColorStop(0.51, '#f00');
-g.addColorStop(1, '#f00');
-ctx.fillStyle = g;
-ctx.translate(50, 25);
-ctx.scale(10, 10);
-ctx.fillRect(-5, -2.5, 10, 5);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.radial.transform.2.html b/content/canvas/test/test_2d.gradient.radial.transform.2.html
deleted file mode 100644
index 30e8f0475237..000000000000
--- a/content/canvas/test/test_2d.gradient.radial.transform.2.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.radial.transform.2</title>
-<!-- Testing: Radial gradient coordinates are relative to the coordinate space at the time of filling -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.translate(100, 0);
-var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2);
-g.addColorStop(0, '#0f0');
-g.addColorStop(0.5, '#0f0');
-g.addColorStop(0.51, '#f00');
-g.addColorStop(1, '#f00');
-ctx.fillStyle = g;
-ctx.translate(-50, 25);
-ctx.scale(10, 10);
-ctx.fillRect(-5, -2.5, 10, 5);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.gradient.radial.transform.3.html b/content/canvas/test/test_2d.gradient.radial.transform.3.html
deleted file mode 100644
index d468e118b71a..000000000000
--- a/content/canvas/test/test_2d.gradient.radial.transform.3.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.gradient.radial.transform.3</title>
-<!-- Testing: Radial gradient transforms do not experience broken caching effects -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2);
-g.addColorStop(0, '#0f0');
-g.addColorStop(0.5, '#0f0');
-g.addColorStop(0.51, '#f00');
-g.addColorStop(1, '#f00');
-ctx.fillStyle = g;
-ctx.fillRect(0, 0, 100, 50);
-ctx.translate(50, 25);
-ctx.scale(10, 10);
-ctx.fillRect(-5, -2.5, 10, 5);
-todo_isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-todo_isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.create.basic.html b/content/canvas/test/test_2d.imageData.create.basic.html
deleted file mode 100644
index 4d691ab4bbca..000000000000
--- a/content/canvas/test/test_2d.imageData.create.basic.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.create.basic - bug 433004</title>
-<!-- Testing: createImageData() exists and returns something -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(ctx.createImageData(1, 1) !== null, "ctx.createImageData(1, 1) !== null");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.create.initial.html b/content/canvas/test/test_2d.imageData.create.initial.html
deleted file mode 100644
index c74a06cda89b..000000000000
--- a/content/canvas/test/test_2d.imageData.create.initial.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.create.initial - bug 433004</title>
-<!-- Testing: createImageData() returns transparent black data of the right size -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var imgdata = ctx.createImageData(10, 20);
-ok(imgdata.data.length == imgdata.width*imgdata.height*4, "imgdata.data.length == imgdata.width*imgdata.height*4");
-ok(imgdata.width < imgdata.height, "imgdata.width < imgdata.height");
-ok(imgdata.width > 0, "imgdata.width > 0");
-var isTransparentBlack = true;
-for (var i = 0; i < imgdata.data.length; ++i)
-    if (imgdata.data[i] !== 0)
-        isTransparentBlack = false;
-ok(isTransparentBlack, "isTransparentBlack");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.create.large.html b/content/canvas/test/test_2d.imageData.create.large.html
deleted file mode 100644
index cb37921d5d9e..000000000000
--- a/content/canvas/test/test_2d.imageData.create.large.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.create.large - bug 433004</title>
-<!-- Testing: createImageData() works for sizes much larger than the canvas -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-
-var imgdata = ctx.createImageData(1000, 2000);
-ok(imgdata.data.length == imgdata.width*imgdata.height*4, "imgdata.data.length == imgdata.width*imgdata.height*4");
-ok(imgdata.width < imgdata.height, "imgdata.width < imgdata.height");
-ok(imgdata.width > 0, "imgdata.width > 0");
-var isTransparentBlack = true;
-for (var i = 0; i < imgdata.data.length; i += 7813) // check ~1024 points (assuming normal scaling)
-    if (imgdata.data[i] !== 0)
-        isTransparentBlack = false;
-ok(isTransparentBlack, "isTransparentBlack");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.create.negative.html b/content/canvas/test/test_2d.imageData.create.negative.html
deleted file mode 100644
index 39e3ba7fec4f..000000000000
--- a/content/canvas/test/test_2d.imageData.create.negative.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.create.negative - bug 433004</title>
-<!-- Testing: createImageData() takes the absolute magnitude of the size arguments -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-var imgdata1 = ctx.createImageData(10, 20);
-var imgdata2 = ctx.createImageData(-10, 20);
-var imgdata3 = ctx.createImageData(10, -20);
-var imgdata4 = ctx.createImageData(-10, -20);
-ok(imgdata1.data.length == imgdata2.data.length, "imgdata1.data.length == imgdata2.data.length");
-ok(imgdata2.data.length == imgdata3.data.length, "imgdata2.data.length == imgdata3.data.length");
-ok(imgdata3.data.length == imgdata4.data.length, "imgdata3.data.length == imgdata4.data.length");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.create.nonfinite.html b/content/canvas/test/test_2d.imageData.create.nonfinite.html
deleted file mode 100644
index 1f7bf52279f9..000000000000
--- a/content/canvas/test/test_2d.imageData.create.nonfinite.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.create.nonfinite - bug 433004</title>
-<!-- Testing: createImageData() throws NOT_SUPPORTED_ERR if arguments are not finite -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.createImageData(Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createImageData(-Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createImageData(NaN, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createImageData(10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createImageData(10, -Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createImageData(10, NaN);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createImageData(Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.create.round.html b/content/canvas/test/test_2d.imageData.create.round.html
deleted file mode 100644
index 35a6e5b8b9a8..000000000000
--- a/content/canvas/test/test_2d.imageData.create.round.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.create.round - bug 433004</title>
-<!-- Testing: createImageData(w, h) is rounded the same as getImageData(0, 0, w, h) -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-
-var imgdata1 = ctx.createImageData(10.01, 10.99);
-var imgdata2 = ctx.getImageData(0, 0, 10.01, 10.99);
-ok(imgdata1.width == imgdata2.width, "imgdata1.width == imgdata2.width");
-ok(imgdata1.height == imgdata2.height, "imgdata1.height == imgdata2.height");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.create.tiny.html b/content/canvas/test/test_2d.imageData.create.tiny.html
deleted file mode 100644
index 089ad1517a4c..000000000000
--- a/content/canvas/test/test_2d.imageData.create.tiny.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.create.tiny - bug 433004</title>
-<!-- Testing: createImageData() works for sizes smaller than one pixel -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-var imgdata = ctx.createImageData(0.0001, 0.0001);
-ok(imgdata.data.length == imgdata.width*imgdata.height*4, "imgdata.data.length == imgdata.width*imgdata.height*4");
-ok(imgdata.width == 1, "imgdata.width == 1");
-ok(imgdata.height == 1, "imgdata.height == 1");
-var isTransparentBlack = true;
-for (var i = 0; i < imgdata.data.length; ++i)
-    if (imgdata.data[i] !== 0)
-        isTransparentBlack = false;
-ok(isTransparentBlack, "isTransparentBlack");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.create.type.html b/content/canvas/test/test_2d.imageData.create.type.html
deleted file mode 100644
index 23086613e41d..000000000000
--- a/content/canvas/test/test_2d.imageData.create.type.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.create.type - bug 433004</title>
-<!-- Testing: createImageData() returns an ImageData object containing a CanvasPixelArray object -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-todo(window.ImageData !== undefined, "window.ImageData !== undefined");
-todo(window.CanvasPixelArray !== undefined, "window.CanvasPixelArray !== undefined");
-window.ImageData.prototype.thisImplementsImageData = true;
-window.CanvasPixelArray.prototype.thisImplementsCanvasPixelArray = true;
-var imgdata = ctx.createImageData(1, 1);
-ok(imgdata.thisImplementsImageData, "imgdata.thisImplementsImageData");
-ok(imgdata.data.thisImplementsCanvasPixelArray, "imgdata.data.thisImplementsCanvasPixelArray");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.create.zero.html b/content/canvas/test/test_2d.imageData.create.zero.html
deleted file mode 100644
index 64830418e747..000000000000
--- a/content/canvas/test/test_2d.imageData.create.zero.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.create.zero - bug 433004</title>
-<!-- Testing: createImageData() throws INDEX_SIZE_ERR if size is zero -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.createImageData(10, 0);
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-var _thrown = undefined; try {
-  ctx.createImageData(0, 10);
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-var _thrown = undefined; try {
-  ctx.createImageData(0, 0);
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.basic.html b/content/canvas/test/test_2d.imageData.get.basic.html
deleted file mode 100644
index df9fe25cc6ae..000000000000
--- a/content/canvas/test/test_2d.imageData.get.basic.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.basic</title>
-<!-- Testing: getImageData() exists and returns something -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(ctx.getImageData(0, 0, 100, 50) !== null, "ctx.getImageData(0, 0, 100, 50) !== null");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.clamp.html b/content/canvas/test/test_2d.imageData.get.clamp.html
deleted file mode 100644
index deccc666966d..000000000000
--- a/content/canvas/test/test_2d.imageData.get.clamp.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.clamp</title>
-<!-- Testing: getImageData() clamps colours to the range [0, 255] -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = 'rgb(-100, -200, -300)';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = 'rgb(256, 300, 400)';
-ctx.fillRect(20, 10, 60, 10);
-var imgdata1 = ctx.getImageData(10, 5, 1, 1);
-ok(imgdata1.data[0] === 0, "imgdata1.data[\""+(0)+"\"] === 0");
-ok(imgdata1.data[1] === 0, "imgdata1.data[\""+(1)+"\"] === 0");
-ok(imgdata1.data[2] === 0, "imgdata1.data[\""+(2)+"\"] === 0");
-var imgdata2 = ctx.getImageData(30, 15, 1, 1);
-ok(imgdata2.data[0] === 255, "imgdata2.data[\""+(0)+"\"] === 255");
-ok(imgdata2.data[1] === 255, "imgdata2.data[\""+(1)+"\"] === 255");
-ok(imgdata2.data[2] === 255, "imgdata2.data[\""+(2)+"\"] === 255");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.nonfinite.html b/content/canvas/test/test_2d.imageData.get.nonfinite.html
deleted file mode 100644
index 7559820f6d1b..000000000000
--- a/content/canvas/test/test_2d.imageData.get.nonfinite.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.nonfinite</title>
-<!-- Testing: getImageData() throws NOT_SUPPORTED_ERR if arguments are not finite -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.getImageData(Infinity, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(-Infinity, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(NaN, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(10, Infinity, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(10, -Infinity, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(10, NaN, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(10, 10, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(10, 10, -Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(10, 10, NaN, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(10, 10, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(10, 10, 10, -Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(10, 10, 10, NaN);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(Infinity, Infinity, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(Infinity, Infinity, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(Infinity, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(Infinity, Infinity, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(Infinity, 10, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(Infinity, 10, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(Infinity, 10, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(10, Infinity, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(10, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(10, Infinity, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(10, 10, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.nonpremul.html b/content/canvas/test/test_2d.imageData.get.nonpremul.html
deleted file mode 100644
index d1a639e41725..000000000000
--- a/content/canvas/test/test_2d.imageData.get.nonpremul.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.nonpremul</title>
-<!-- Testing: getImageData() returns non-premultiplied colours -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.order.alpha.html b/content/canvas/test/test_2d.imageData.get.order.alpha.html
deleted file mode 100644
index 2b9bb43ba6f3..000000000000
--- a/content/canvas/test/test_2d.imageData.get.order.alpha.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.order.alpha</title>
-<!-- Testing: getImageData() returns A in the fourth component -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.order.cols.html b/content/canvas/test/test_2d.imageData.get.order.cols.html
deleted file mode 100644
index 445227308c6c..000000000000
--- a/content/canvas/test/test_2d.imageData.get.order.cols.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.order.cols</title>
-<!-- Testing: getImageData() returns leftmost columns first -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#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.round(imgdata.width/2*4)] === 255, "imgdata.data[Math.round(imgdata.width/2*4)] === 255");
-ok(imgdata.data[Math.round((imgdata.height/2)*imgdata.width*4)] === 0, "imgdata.data[Math.round((imgdata.height/2)*imgdata.width*4)] === 0");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.order.rgb.html b/content/canvas/test/test_2d.imageData.get.order.rgb.html
deleted file mode 100644
index a6397d2b3f5d..000000000000
--- a/content/canvas/test/test_2d.imageData.get.order.rgb.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.order.rgb</title>
-<!-- Testing: getImageData() returns R then G then B -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.order.rows.html b/content/canvas/test/test_2d.imageData.get.order.rows.html
deleted file mode 100644
index c0669e9d5f12..000000000000
--- a/content/canvas/test/test_2d.imageData.get.order.rows.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.order.rows</title>
-<!-- Testing: getImageData() returns topmost rows first -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.range.html b/content/canvas/test/test_2d.imageData.get.range.html
deleted file mode 100644
index eb24ea1871e9..000000000000
--- a/content/canvas/test/test_2d.imageData.get.range.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.range</title>
-<!-- Testing: getImageData() returns values in the range [0, 255] -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#000';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#fff';
-ctx.fillRect(20, 10, 60, 10);
-var imgdata1 = ctx.getImageData(10, 5, 1, 1);
-ok(imgdata1.data[0] === 0, "imgdata1.data[\""+(0)+"\"] === 0");
-var imgdata2 = ctx.getImageData(30, 15, 1, 1);
-ok(imgdata2.data[0] === 255, "imgdata2.data[\""+(0)+"\"] === 255");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.source.negative.html b/content/canvas/test/test_2d.imageData.get.source.negative.html
deleted file mode 100644
index ea3f2dd8266e..000000000000
--- a/content/canvas/test/test_2d.imageData.get.source.negative.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.source.negative</title>
-<!-- Testing: getImageData() works with negative width and height -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#000';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#fff';
-ctx.fillRect(20, 10, 60, 10);
-
-var imgdata1 = ctx.getImageData(85, 25, -10, -10);
-ok(imgdata1.data[0] === 0, "imgdata1.data[\""+(0)+"\"] === 0");
-ok(imgdata1.data[1] === 0, "imgdata1.data[\""+(1)+"\"] === 0");
-ok(imgdata1.data[2] === 0, "imgdata1.data[\""+(2)+"\"] === 0");
-ok(imgdata1.data[3] === 255, "imgdata1.data[\""+(3)+"\"] === 255");
-ok(imgdata1.data[imgdata1.length-4+0] === 255, "imgdata1.data[imgdata1.length-4+0] === 255");
-ok(imgdata1.data[imgdata1.length-4+1] === 255, "imgdata1.data[imgdata1.length-4+1] === 255");
-ok(imgdata1.data[imgdata1.length-4+2] === 255, "imgdata1.data[imgdata1.length-4+2] === 255");
-ok(imgdata1.data[imgdata1.length-4+3] === 255, "imgdata1.data[imgdata1.length-4+3] === 255");
-
-var imgdata2 = ctx.getImageData(0, 0, -1, -1);
-ok(imgdata2.data[0] === 0, "imgdata2.data[\""+(0)+"\"] === 0");
-ok(imgdata2.data[1] === 0, "imgdata2.data[\""+(1)+"\"] === 0");
-ok(imgdata2.data[2] === 0, "imgdata2.data[\""+(2)+"\"] === 0");
-ok(imgdata2.data[3] === 0, "imgdata2.data[\""+(3)+"\"] === 0");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.source.outside.html b/content/canvas/test/test_2d.imageData.get.source.outside.html
deleted file mode 100644
index 9fce1e7f4828..000000000000
--- a/content/canvas/test/test_2d.imageData.get.source.outside.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.source.outside</title>
-<!-- Testing: getImageData() returns transparent black outside the canvas -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#08f';
-ctx.fillRect(0, 0, 100, 50);
-
-var imgdata1 = ctx.getImageData(-10, 5, 1, 1);
-ok(imgdata1.data[0] === 0, "imgdata1.data[\""+(0)+"\"] === 0");
-ok(imgdata1.data[1] === 0, "imgdata1.data[\""+(1)+"\"] === 0");
-ok(imgdata1.data[2] === 0, "imgdata1.data[\""+(2)+"\"] === 0");
-ok(imgdata1.data[3] === 0, "imgdata1.data[\""+(3)+"\"] === 0");
-
-var imgdata2 = ctx.getImageData(10, -5, 1, 1);
-ok(imgdata2.data[0] === 0, "imgdata2.data[\""+(0)+"\"] === 0");
-ok(imgdata2.data[1] === 0, "imgdata2.data[\""+(1)+"\"] === 0");
-ok(imgdata2.data[2] === 0, "imgdata2.data[\""+(2)+"\"] === 0");
-ok(imgdata2.data[3] === 0, "imgdata2.data[\""+(3)+"\"] === 0");
-
-var imgdata3 = ctx.getImageData(200, 5, 1, 1);
-ok(imgdata3.data[0] === 0, "imgdata3.data[\""+(0)+"\"] === 0");
-ok(imgdata3.data[1] === 0, "imgdata3.data[\""+(1)+"\"] === 0");
-ok(imgdata3.data[2] === 0, "imgdata3.data[\""+(2)+"\"] === 0");
-ok(imgdata3.data[3] === 0, "imgdata3.data[\""+(3)+"\"] === 0");
-
-var imgdata4 = ctx.getImageData(10, 60, 1, 1);
-ok(imgdata4.data[0] === 0, "imgdata4.data[\""+(0)+"\"] === 0");
-ok(imgdata4.data[1] === 0, "imgdata4.data[\""+(1)+"\"] === 0");
-ok(imgdata4.data[2] === 0, "imgdata4.data[\""+(2)+"\"] === 0");
-ok(imgdata4.data[3] === 0, "imgdata4.data[\""+(3)+"\"] === 0");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.source.size.html b/content/canvas/test/test_2d.imageData.get.source.size.html
deleted file mode 100644
index c2242ad92cd9..000000000000
--- a/content/canvas/test/test_2d.imageData.get.source.size.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.source.size</title>
-<!-- Testing: getImageData() returns bigger ImageData for bigger source rectangle -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.tiny.html b/content/canvas/test/test_2d.imageData.get.tiny.html
deleted file mode 100644
index c2bec550f614..000000000000
--- a/content/canvas/test/test_2d.imageData.get.tiny.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.tiny</title>
-<!-- Testing: getImageData() works for sizes smaller than one pixel -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-var imgdata = ctx.getImageData(0, 0, 0.0001, 0.0001);
-ok(imgdata.data.length == imgdata.width*imgdata.height*4, "imgdata.data.length == imgdata.width*imgdata.height*4");
-ok(imgdata.width == 1, "imgdata.width == 1");
-ok(imgdata.height == 1, "imgdata.height == 1");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.type.html b/content/canvas/test/test_2d.imageData.get.type.html
deleted file mode 100644
index c5a03bf39e0d..000000000000
--- a/content/canvas/test/test_2d.imageData.get.type.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.type</title>
-<!-- Testing: getImageData() returns an ImageData object containing a CanvasPixelArray object -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-todo(window.ImageData !== undefined, "window.ImageData !== undefined");
-todo(window.CanvasPixelArray !== undefined, "window.CanvasPixelArray !== undefined");
-window.ImageData.prototype.thisImplementsImageData = true;
-window.CanvasPixelArray.prototype.thisImplementsCanvasPixelArray = true;
-var imgdata = ctx.getImageData(0, 0, 1, 1);
-ok(imgdata.thisImplementsImageData, "imgdata.thisImplementsImageData");
-ok(imgdata.data.thisImplementsCanvasPixelArray, "imgdata.data.thisImplementsCanvasPixelArray");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.unaffected.html b/content/canvas/test/test_2d.imageData.get.unaffected.html
deleted file mode 100644
index 4fe4effc2583..000000000000
--- a/content/canvas/test/test_2d.imageData.get.unaffected.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.unaffected</title>
-<!-- Testing: getImageData() is not affected by context state -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 50, 50)
-ctx.fillStyle = '#f00';
-ctx.fillRect(50, 0, 50, 50)
-ctx.save();
-ctx.translate(50, 0);
-ctx.globalAlpha = 0.1;
-ctx.globalCompositeOperation = 'destination-atop';
-ctx.shadowColor = '#f00';
-ctx.rect(0, 0, 5, 5);
-ctx.clip();
-var imgdata = ctx.getImageData(0, 0, 50, 50);
-ctx.restore();
-ctx.putImageData(imgdata, 50, 0);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.get.zero.html b/content/canvas/test/test_2d.imageData.get.zero.html
deleted file mode 100644
index 3e8ae460a705..000000000000
--- a/content/canvas/test/test_2d.imageData.get.zero.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.get.zero</title>
-<!-- Testing: getImageData() throws INDEX_SIZE_ERR if size is zero -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.getImageData(1, 1, 10, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(1, 1, 0, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-var _thrown = undefined; try {
-  ctx.getImageData(1, 1, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.object.clamp.html b/content/canvas/test/test_2d.imageData.object.clamp.html
deleted file mode 100644
index 3ffbd4d7677f..000000000000
--- a/content/canvas/test/test_2d.imageData.object.clamp.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.object.clamp</title>
-<!-- Testing: ImageData.data clamps numbers to [0, 255] -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var imgdata = ctx.getImageData(0, 0, 10, 10);
-
-imgdata.data[0] = 100;
-imgdata.data[0] = 300;
-todo(imgdata.data[0] === 255, "imgdata.data[\""+(0)+"\"] === 255");
-imgdata.data[0] = 100;
-imgdata.data[0] = -100;
-todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
-
-imgdata.data[0] = 100;
-imgdata.data[0] = 200+Math.pow(2, 32);
-todo(imgdata.data[0] === 255, "imgdata.data[\""+(0)+"\"] === 255");
-imgdata.data[0] = 100;
-imgdata.data[0] = -200-Math.pow(2, 32);
-todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
-
-imgdata.data[0] = 100;
-imgdata.data[0] = Math.pow(10, 39);
-todo(imgdata.data[0] === 255, "imgdata.data[\""+(0)+"\"] === 255");
-imgdata.data[0] = 100;
-imgdata.data[0] = -Math.pow(10, 39);
-todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
-
-imgdata.data[0] = 100;
-imgdata.data[0] = -Infinity;
-todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
-imgdata.data[0] = 100;
-imgdata.data[0] = Infinity;
-todo(imgdata.data[0] === 255, "imgdata.data[\""+(0)+"\"] === 255");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.object.ctor.html b/content/canvas/test/test_2d.imageData.object.ctor.html
deleted file mode 100644
index ff4523035ca1..000000000000
--- a/content/canvas/test/test_2d.imageData.object.ctor.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.object.ctor</title>
-<!-- Testing: ImageData does not have a usable constructor -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-todo(window.ImageData !== undefined, "window.ImageData !== undefined");
-try { var _thrown = false;
-  new window.ImageData(1,1);
-} catch (e) { _thrown = true; } finally { ok(_thrown, "should throw exception"); }
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.object.nan.html b/content/canvas/test/test_2d.imageData.object.nan.html
deleted file mode 100644
index 8ef61e141692..000000000000
--- a/content/canvas/test/test_2d.imageData.object.nan.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.object.nan</title>
-<!-- Testing: ImageData.data converts NaN to 0 -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var imgdata = ctx.getImageData(0, 0, 10, 10);
-imgdata.data[0] = 100;
-imgdata.data[0] = NaN;
-todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
-imgdata.data[0] = 100;
-imgdata.data[0] = "cheese";
-todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.object.properties.html b/content/canvas/test/test_2d.imageData.object.properties.html
deleted file mode 100644
index 4b8b7e08f97e..000000000000
--- a/content/canvas/test/test_2d.imageData.object.properties.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.object.properties</title>
-<!-- Testing: ImageData objects have the right properties -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var imgdata = ctx.getImageData(0, 0, 10, 10);
-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'");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.object.readonly.html b/content/canvas/test/test_2d.imageData.object.readonly.html
deleted file mode 100644
index 4372dd75c566..000000000000
--- a/content/canvas/test/test_2d.imageData.object.readonly.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.object.readonly</title>
-<!-- Testing: ImageData objects properties are read-only -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var imgdata = ctx.getImageData(0, 0, 10, 10);
-var w = imgdata.width;
-var h = imgdata.height;
-var d = imgdata.data;
-imgdata.width = 123;
-imgdata.height = 123;
-imgdata.data = [100,100,100,100];
-todo(imgdata.width === w, "imgdata.width === w");
-todo(imgdata.height === h, "imgdata.height === h");
-todo(imgdata.data === d, "imgdata.data === d");
-todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
-todo(imgdata.data[1] === 0, "imgdata.data[\""+(1)+"\"] === 0");
-todo(imgdata.data[2] === 0, "imgdata.data[\""+(2)+"\"] === 0");
-todo(imgdata.data[3] === 0, "imgdata.data[\""+(3)+"\"] === 0");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.object.round.html b/content/canvas/test/test_2d.imageData.object.round.html
deleted file mode 100644
index 5b2ed0081ae5..000000000000
--- a/content/canvas/test/test_2d.imageData.object.round.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.object.round</title>
-<!-- Testing: ImageData.data rounds numbers with convertToIntegerTiesToEven -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var imgdata = ctx.getImageData(0, 0, 10, 10);
-imgdata.data[0] = 0.499;
-todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
-imgdata.data[0] = 0.5;
-todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
-imgdata.data[0] = 0.501;
-todo(imgdata.data[0] === 1, "imgdata.data[\""+(0)+"\"] === 1");
-imgdata.data[0] = 1.499;
-todo(imgdata.data[0] === 1, "imgdata.data[\""+(0)+"\"] === 1");
-imgdata.data[0] = 1.5;
-todo(imgdata.data[0] === 2, "imgdata.data[\""+(0)+"\"] === 2");
-imgdata.data[0] = 1.501;
-todo(imgdata.data[0] === 2, "imgdata.data[\""+(0)+"\"] === 2");
-imgdata.data[0] = 2.5;
-todo(imgdata.data[0] === 2, "imgdata.data[\""+(0)+"\"] === 2");
-imgdata.data[0] = 3.5;
-todo(imgdata.data[0] === 4, "imgdata.data[\""+(0)+"\"] === 4");
-imgdata.data[0] = 252.5;
-todo(imgdata.data[0] === 252, "imgdata.data[\""+(0)+"\"] === 252");
-imgdata.data[0] = 253.5;
-todo(imgdata.data[0] === 254, "imgdata.data[\""+(0)+"\"] === 254");
-imgdata.data[0] = 254.5;
-todo(imgdata.data[0] === 254, "imgdata.data[\""+(0)+"\"] === 254");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.object.set.html b/content/canvas/test/test_2d.imageData.object.set.html
deleted file mode 100644
index 29124b2a5860..000000000000
--- a/content/canvas/test/test_2d.imageData.object.set.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.object.set</title>
-<!-- Testing: ImageData.data can be modified -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var imgdata = ctx.getImageData(0, 0, 10, 10);
-imgdata.data[0] = 100;
-ok(imgdata.data[0] === 100, "imgdata.data[\""+(0)+"\"] === 100");
-imgdata.data[0] = 200;
-ok(imgdata.data[0] === 200, "imgdata.data[\""+(0)+"\"] === 200");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.object.string.html b/content/canvas/test/test_2d.imageData.object.string.html
deleted file mode 100644
index 82d7d8a36e30..000000000000
--- a/content/canvas/test/test_2d.imageData.object.string.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.object.string</title>
-<!-- Testing: ImageData.data converts strings to numbers with ToNumber -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var imgdata = ctx.getImageData(0, 0, 10, 10);
-imgdata.data[0] = 100;
-imgdata.data[0] = "110";
-todo(imgdata.data[0] === 110, "imgdata.data[\""+(0)+"\"] === 110");
-imgdata.data[0] = 100;
-imgdata.data[0] = "0x78";
-todo(imgdata.data[0] === 120, "imgdata.data[\""+(0)+"\"] === 120");
-imgdata.data[0] = 100;
-imgdata.data[0] = " +130e0 ";
-todo(imgdata.data[0] === 130, "imgdata.data[\""+(0)+"\"] === 130");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.object.undefined.html b/content/canvas/test/test_2d.imageData.object.undefined.html
deleted file mode 100644
index ccf1fb3d7880..000000000000
--- a/content/canvas/test/test_2d.imageData.object.undefined.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.object.undefined</title>
-<!-- Testing: ImageData.data converts undefined to 0 -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var imgdata = ctx.getImageData(0, 0, 10, 10);
-imgdata.data[0] = 100;
-imgdata.data[0] = undefined;
-todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.alpha.html b/content/canvas/test/test_2d.imageData.put.alpha.html
deleted file mode 100644
index 6a94fdef272d..000000000000
--- a/content/canvas/test/test_2d.imageData.put.alpha.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.alpha</title>
-<!-- Testing: putImageData() puts non-solid image data correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = 'rgba(0, 255, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.basic.html b/content/canvas/test/test_2d.imageData.put.basic.html
deleted file mode 100644
index 92607bbb4be1..000000000000
--- a/content/canvas/test/test_2d.imageData.put.basic.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.basic</title>
-<!-- Testing: putImageData() puts image data from getImageData() onto the canvas -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50)
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.clip.html b/content/canvas/test/test_2d.imageData.put.clip.html
deleted file mode 100644
index 2f30c30fee33..000000000000
--- a/content/canvas/test/test_2d.imageData.put.clip.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.clip - bug 433397</title>
-<!-- Testing: putImageData() is not affected by clipping regions -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50)
-var imgdata = ctx.getImageData(0, 0, 100, 50);
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50)
-ctx.beginPath();
-ctx.rect(0, 0, 50, 50);
-ctx.clip();
-ctx.putImageData(imgdata, 0, 0);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.created.html b/content/canvas/test/test_2d.imageData.put.created.html
deleted file mode 100644
index 239586b24575..000000000000
--- a/content/canvas/test/test_2d.imageData.put.created.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.created - bug 433004</title>
-<!-- Testing: putImageData() puts image data from createImageData() onto the canvas -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var imgdata = ctx.createImageData(100, 50);
-for (var i = 0; i < imgdata.data.length; i += 4) {
-    imgdata.data[i] = 0;
-    imgdata.data[i+1] = 255;
-    imgdata.data[i+2] = 0;
-    imgdata.data[i+3] = 255;
-}
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50)
-ctx.putImageData(imgdata, 0, 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.cross.html b/content/canvas/test/test_2d.imageData.put.cross.html
deleted file mode 100644
index 31bf1cb99b46..000000000000
--- a/content/canvas/test/test_2d.imageData.put.cross.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.cross</title>
-<!-- Testing: putImageData() accepts image data got from a different canvas -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var canvas2 = document.createElement('canvas');
-var ctx2 = canvas2.getContext('2d');
-ctx2.fillStyle = '#0f0';
-ctx2.fillRect(0, 0, 100, 50)
-var imgdata = ctx2.getImageData(0, 0, 100, 50);
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50)
-ctx.putImageData(imgdata, 0, 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.dirty.negative.html b/content/canvas/test/test_2d.imageData.put.dirty.negative.html
deleted file mode 100644
index f66e65d9cee3..000000000000
--- a/content/canvas/test/test_2d.imageData.put.dirty.negative.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.dirty.negative</title>
-<!-- Testing: putImageData() handles negative-sized dirty rectangles correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50)
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 20, 20)
-
-var imgdata = ctx.getImageData(0, 0, 100, 50);
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50)
-ctx.fillStyle = '#f00';
-ctx.fillRect(40, 20, 20, 20)
-ctx.putImageData(imgdata, 40, 20, 20, 20, -20, -20);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-isPixel(ctx, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2);
-isPixel(ctx, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2);
-isPixel(ctx, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2);
-isPixel(ctx, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.dirty.outside.html b/content/canvas/test/test_2d.imageData.put.dirty.outside.html
deleted file mode 100644
index 454f8ccacbd2..000000000000
--- a/content/canvas/test/test_2d.imageData.put.dirty.outside.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.dirty.outside</title>
-<!-- Testing: putImageData() handles dirty rectangles outside the canvas correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50)
-
-var imgdata = ctx.getImageData(0, 0, 100, 50);
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50)
-
-ctx.putImageData(imgdata, 100, 20, 20, 20, -20, -20);
-ctx.putImageData(imgdata, 200, 200, 0, 0, 100, 50);
-ctx.putImageData(imgdata, 40, 20, -30, -20, 30, 20);
-ctx.putImageData(imgdata, -30, 20, 0, 0, 30, 20);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-isPixel(ctx, 98,15, 0,255,0,255, "98,15", "0,255,0,255", 2);
-isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 2);
-isPixel(ctx, 98,45, 0,255,0,255, "98,45", "0,255,0,255", 2);
-isPixel(ctx, 1,5, 0,255,0,255, "1,5", "0,255,0,255", 2);
-isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 2);
-isPixel(ctx, 1,45, 0,255,0,255, "1,45", "0,255,0,255", 2);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.dirty.rect1.html b/content/canvas/test/test_2d.imageData.put.dirty.rect1.html
deleted file mode 100644
index 6f70ad75e12c..000000000000
--- a/content/canvas/test/test_2d.imageData.put.dirty.rect1.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.dirty.rect1</title>
-<!-- Testing: putImageData() only modifies areas inside the dirty rectangle, using width and height -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50)
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 20, 20)
-
-var imgdata = ctx.getImageData(0, 0, 100, 50);
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50)
-ctx.fillStyle = '#f00';
-ctx.fillRect(40, 20, 20, 20)
-ctx.putImageData(imgdata, 40, 20, 0, 0, 20, 20);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-isPixel(ctx, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2);
-isPixel(ctx, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2);
-isPixel(ctx, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2);
-isPixel(ctx, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.dirty.rect2.html b/content/canvas/test/test_2d.imageData.put.dirty.rect2.html
deleted file mode 100644
index 5ad247d36f2c..000000000000
--- a/content/canvas/test/test_2d.imageData.put.dirty.rect2.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.dirty.rect2</title>
-<!-- Testing: putImageData() only modifies areas inside the dirty rectangle, using x and y -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50)
-ctx.fillStyle = '#0f0';
-ctx.fillRect(60, 30, 20, 20)
-
-var imgdata = ctx.getImageData(0, 0, 100, 50);
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50)
-ctx.fillStyle = '#f00';
-ctx.fillRect(40, 20, 20, 20)
-ctx.putImageData(imgdata, -20, -10, 60, 30, 20, 20);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-isPixel(ctx, 35,25, 0,255,0,255, "35,25", "0,255,0,255", 2);
-isPixel(ctx, 65,25, 0,255,0,255, "65,25", "0,255,0,255", 2);
-isPixel(ctx, 50,15, 0,255,0,255, "50,15", "0,255,0,255", 2);
-isPixel(ctx, 50,45, 0,255,0,255, "50,45", "0,255,0,255", 2);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.dirty.zero.html b/content/canvas/test/test_2d.imageData.put.dirty.zero.html
deleted file mode 100644
index c7e1f8661478..000000000000
--- a/content/canvas/test/test_2d.imageData.put.dirty.zero.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.dirty.zero</title>
-<!-- Testing: putImageData() with zero-sized dirty rectangle puts nothing -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50)
-var imgdata = ctx.getImageData(0, 0, 100, 50);
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50)
-ctx.putImageData(imgdata, 0, 0, 0, 0, 0, 0);
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.modified.html b/content/canvas/test/test_2d.imageData.put.modified.html
deleted file mode 100644
index 3dc7e3f6aed1..000000000000
--- a/content/canvas/test/test_2d.imageData.put.modified.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.modified</title>
-<!-- Testing: putImageData() puts modified image data correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50)
-ctx.fillStyle = '#f00';
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.nonfinite.html b/content/canvas/test/test_2d.imageData.put.nonfinite.html
deleted file mode 100644
index 4ce4971a7155..000000000000
--- a/content/canvas/test/test_2d.imageData.put.nonfinite.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.nonfinite</title>
-<!-- Testing: putImageData() throws NOT_SUPPORTED_ERR if arguments are not finite -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var imgdata = ctx.getImageData(0, 0, 10, 10);
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, -Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, NaN, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, -Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, NaN);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, 10, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, -Infinity, 10, 10, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, NaN, 10, 10, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, 10, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, -Infinity, 10, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, NaN, 10, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, Infinity, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, -Infinity, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, NaN, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, 10, Infinity, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, 10, -Infinity, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, 10, NaN, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, 10, 10, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, 10, 10, -Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, 10, 10, NaN, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, 10, 10, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, 10, 10, 10, -Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, 10, 10, 10, NaN);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, 10, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, Infinity, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, Infinity, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, Infinity, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, 10, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, 10, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, 10, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, 10, Infinity, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, 10, Infinity, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, 10, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, 10, Infinity, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, 10, 10, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, 10, 10, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, Infinity, 10, 10, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, Infinity, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, Infinity, Infinity, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, Infinity, Infinity, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, Infinity, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, Infinity, Infinity, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, Infinity, 10, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, Infinity, 10, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, Infinity, 10, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, 10, Infinity, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, 10, Infinity, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, 10, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, 10, Infinity, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, 10, 10, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, 10, 10, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, Infinity, 10, 10, 10, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, Infinity, 10, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, Infinity, Infinity, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, Infinity, Infinity, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, Infinity, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, Infinity, Infinity, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, Infinity, 10, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, Infinity, 10, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, Infinity, 10, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, 10, Infinity, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, 10, Infinity, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, 10, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, 10, Infinity, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, 10, 10, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, 10, 10, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, Infinity, 10, 10, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, Infinity, Infinity, 10, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, Infinity, Infinity, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, Infinity, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, Infinity, Infinity, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, Infinity, 10, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, Infinity, 10, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, Infinity, 10, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, 10, Infinity, Infinity, 10);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, 10, Infinity, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, 10, Infinity, 10, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 10, 10, 10, 10, Infinity, Infinity);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.null.html b/content/canvas/test/test_2d.imageData.put.null.html
deleted file mode 100644
index 365d2504296d..000000000000
--- a/content/canvas/test/test_2d.imageData.put.null.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.null - bug 421715</title>
-<!-- Testing: putImageData() with null imagedata throws TYPE_MISMATCH_ERR -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.putImageData(null, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.path.html b/content/canvas/test/test_2d.imageData.put.path.html
deleted file mode 100644
index b65ba05d7aea..000000000000
--- a/content/canvas/test/test_2d.imageData.put.path.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.path</title>
-<!-- Testing: putImageData() does not affect the current path -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50)
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.unaffected.html b/content/canvas/test/test_2d.imageData.put.unaffected.html
deleted file mode 100644
index 1a0413869167..000000000000
--- a/content/canvas/test/test_2d.imageData.put.unaffected.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.unaffected</title>
-<!-- Testing: putImageData() is not affected by context state -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50)
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.unchanged.html b/content/canvas/test/test_2d.imageData.put.unchanged.html
deleted file mode 100644
index 5d7b3d43fb7c..000000000000
--- a/content/canvas/test/test_2d.imageData.put.unchanged.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.unchanged</title>
-<!-- Testing: putImageData(getImageData(...), ...) has no effect -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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)+"\"]");
-}
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageData.put.wrongtype.html b/content/canvas/test/test_2d.imageData.put.wrongtype.html
deleted file mode 100644
index 6d8a8bd6739d..000000000000
--- a/content/canvas/test/test_2d.imageData.put.wrongtype.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imageData.put.wrongtype</title>
-<!-- Testing: putImageData() does not accept non-ImageData objects -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var imgdata = { width: 1, height: 1, data: [255, 0, 0, 255] };
-var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData("cheese", 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-var _thrown = undefined; try {
-  ctx.putImageData(42, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.imageSmoothing.html b/content/canvas/test/test_2d.imageSmoothing.html
deleted file mode 100644
index f2f05459d048..000000000000
--- a/content/canvas/test/test_2d.imageSmoothing.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>Canvas test: 2d.imageRenderingQuality</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<script type="text/javascript">
-
-var _deferred = false;
-
-function setup() {
-  var c2 = document.getElementById("c2");
-  var cx2 = c2.getContext("2d");
-
-  cx2.fillStyle = "red";
-  cx2.fillRect(0, 0, 2, 2);
-
-  cx2.fillStyle = "rgb(0,255,0)";
-  cx2.fillRect(0, 0, 1, 1);
-}
-
-function f() {
-  setup();
-
-  var c = document.getElementById("c");
-  var c2 = document.getElementById("c2");
-
-  var cx = c.getContext("2d");
-
-  ok(cx.mozImageSmoothingEnabled == true, "initial mozImageSmoothingEnabled is true");
-
-  // check that mozImageSmoothingEnabled is part of the context
-  cx.save();
-  cx.mozImageSmoothingEnabled = false;
-  ok(cx.mozImageSmoothingEnabled == false, "mozImageSmoothingEnabled is false after setting");
-  cx.restore();
-  ok(cx.mozImageSmoothingEnabled == true, "mozImageSmoothingEnabled is true after restore");
-
-  // check that false works
-  cx.mozImageSmoothingEnabled = false;
-
-  cx.scale(10,10);
-  cx.drawImage(c2, 0, 0);
-
-  // this should be all red
-  var data = cx.getImageData(9, 9, 1, 1);
-  var pixels = data.data;
-  ok (pixels[0] == 0 &&
-      pixels[1] == 255 &&
-      pixels[2] == 0 &&
-      pixels[3] == 255,
-      "pixel is " + pixels.toSource() + " (expected [0,255,0,255])");
-
-  if (!_deferred) SimpleTest.finish();
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(f);
-</script>
-</head>
-<body>
-<canvas id="c" width="10" height="10"></canvas><br>
-<canvas style="visibility: hidden" id="c2" width="2" height="2"></canvas>
-</body>
-</html>
diff --git a/content/canvas/test/test_2d.imagedata_coercion.html b/content/canvas/test/test_2d.imagedata_coercion.html
deleted file mode 100644
index cc502456318d..000000000000
--- a/content/canvas/test/test_2d.imagedata_coercion.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.imagedata_coercion</title>
-<!-- Testing: imagedata coerced correctly on set -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="1"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-/* NOTE: Due to round-tripping through premultiplied values and the rounding
-that ensues, values of alpha < 255 will tend to do weird things.  In
-particular, the premultiplied color values are computed by multiplying by a,
-dividing by 255, then always rounding up.  The conversion the other way is done
-by multiplying by 255/a and rounding down.  So if
-
-  255/a * (amount added when rounding) > 1
-
-we will get a change in value when we go through a putImageData/getImageData cycle.  Therefore, to make sure we don't have to worry about our color
-channels, our alpha channel should never be < 250, unless it's 0.  And when it's 0, all our color channels will come back as 0 too. */
-  
-/* Our tests.  Each test has two arrays: the array of values to set and the
-   array of values that should read back as a result. */
-var tests = [
-  [
-    [ 0, 1, 3, 250 ], [ 0, 1, 3, 250 ]
-  ],
-  [
-    [ 0, 1, 2, 250, 4, 5, 6, 250 ], [ 0, 1, 2, 250, 4, 5, 6, 250 ]
-  ],
-  [
-    [ 0, 1000, 2, 300, 400, 5, 600, 250 ], [ 0, 255, 2, 255, 255, 5, 255, 250 ]
-  ],
-  [
-    [ -10, -5, NaN, 250, 4, 5, 6, -250 ], [ 0, 0, 0, 250, 0, 0, 0, 0 ]
-  ],
-  [
-    [ 0.5, 12.2, 12.8, 251.5, 12.5, 13.5, 13.2, 250.5 ],
-    [ 0, 12, 13, 252, 12, 14, 13, 250 ]
-  ],
-];
-
-function doTest(type, idx) {
-  var testPair = tests[idx];
-  var test = testPair[0];
-  var ref = testPair[1];
-  var descSuffix = " for " + type + " test #" + (idx+1);
-  function myIs(a, b, str) {
-    is(a, b, str + descSuffix);
-  }
-
-  myIs(test.length, ref.length, "Length mismatch");
-  myIs(test.length % 4, 0, "Length not a multiple of 4");
-  var pixels = test.length / 4;
-  var imageData = ctx.createImageData(pixels, 1);
-  myIs(imageData.width, pixels, "Incorrect created data width");
-  myIs(imageData.height, 1, "Incorrect created data height");
-  myIs(imageData.data.length, test.length,
-       "Incorrect length in created image data");
-
-  ctx.putImageData(imageData, 0, 0);
-  var testImageData = ctx.getImageData(0, 0, pixels, 1);
-  myIs(testImageData.data.length, test.length,
-       "Incorrect length in test image data after clearing pixels");
-  var j;
-  for (j = 0; j < testImageData.data.length; ++j) {
-    myIs(testImageData.data[j], 0,
-         "Nonzero value at position " + j + " in test image data " +
-         "after clearing pixels");
-  }
-  for (j = 0; j < imageData.data.length; ++j) {
-    imageData.data[j] = test[j];
-  }
-  if (type == "slow") {
-    // convert to a non-dense array so we can test that codepath
-    imageData.data.makeMeSlow = 1;
-  }
-  ctx.putImageData(imageData, 0, 0);
-  testImageData = ctx.getImageData(0, 0, pixels, 1);
-  myIs(testImageData.data.length, test.length,
-       "Incorrect length in test image data after putting our imagedata");
-  for (j = 0; j < testImageData.data.length; ++j) {
-    myIs(testImageData.data[j], ref[j],
-         "Incorrect value at position " + j + " in test image data " +
-         "after putting our imagedata");
-  }
-}
-
-function doTests(type) {
-  for (var i = 0; i < tests.length; ++i) {
-    doTest(type, i);
-  }
-}
-
-var canvas;
-var ctx;
-                      
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(function () {
-
-canvas = document.getElementById('c');
-ctx = canvas.getContext('2d');
-
-doTests("fast");
-doTests("slow")
-
-SimpleTest.finish();
-
-});
-</script>
diff --git a/content/canvas/test/test_2d.line.cap.butt.html b/content/canvas/test/test_2d.line.cap.butt.html
deleted file mode 100644
index 2e09541eea21..000000000000
--- a/content/canvas/test/test_2d.line.cap.butt.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.cap.butt</title>
-<!-- Testing: lineCap 'butt' is rendered correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.cap.invalid.html b/content/canvas/test/test_2d.line.cap.invalid.html
deleted file mode 100644
index 60ec44ae04a6..000000000000
--- a/content/canvas/test/test_2d.line.cap.invalid.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.cap.invalid - bug 401788</title>
-<!-- Testing: Setting lineCap to invalid values is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.lineCap = 'butt'
-ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
-
-ctx.lineCap = 'butt';
-ctx.lineCap = 'invalid';
-ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
-
-ctx.lineCap = 'butt';
-ctx.lineCap = 'ROUND';
-ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
-
-ctx.lineCap = 'butt';
-ctx.lineCap = 'round\0';
-ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
-
-ctx.lineCap = 'butt';
-ctx.lineCap = 'round ';
-ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
-
-ctx.lineCap = 'butt';
-ctx.lineCap = "";
-ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
-
-ctx.lineCap = 'butt';
-ctx.lineCap = 'bevel';
-ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.cap.open.html b/content/canvas/test/test_2d.line.cap.open.html
deleted file mode 100644
index b9b9ad9da2bf..000000000000
--- a/content/canvas/test/test_2d.line.cap.open.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.cap.open</title>
-<!-- Testing: Line caps are drawn at the corners of an unclosed rectangle -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.cap.round.html b/content/canvas/test/test_2d.line.cap.round.html
deleted file mode 100644
index 440bd94a3aa9..000000000000
--- a/content/canvas/test/test_2d.line.cap.round.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.cap.round</title>
-<!-- Testing: lineCap 'round' is rendered correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.cap.square.html b/content/canvas/test/test_2d.line.cap.square.html
deleted file mode 100644
index 0399152ca2af..000000000000
--- a/content/canvas/test/test_2d.line.cap.square.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.cap.square</title>
-<!-- Testing: lineCap 'square' is rendered correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.cross.html b/content/canvas/test/test_2d.line.cross.html
deleted file mode 100644
index 7d6d538c8239..000000000000
--- a/content/canvas/test/test_2d.line.cross.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.cross</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.defaults.html b/content/canvas/test/test_2d.line.defaults.html
deleted file mode 100644
index 3da4aa3f9bc4..000000000000
--- a/content/canvas/test/test_2d.line.defaults.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.defaults</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.join.bevel.html b/content/canvas/test/test_2d.line.join.bevel.html
deleted file mode 100644
index fd4d79fcba35..000000000000
--- a/content/canvas/test/test_2d.line.join.bevel.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.join.bevel</title>
-<!-- Testing: lineJoin 'bevel' is rendered correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.join.closed.html b/content/canvas/test/test_2d.line.join.closed.html
deleted file mode 100644
index 09aa3e49e6dd..000000000000
--- a/content/canvas/test/test_2d.line.join.closed.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.join.closed</title>
-<!-- Testing: Line joins are drawn at the corner of a closed rectangle -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.join.invalid.html b/content/canvas/test/test_2d.line.join.invalid.html
deleted file mode 100644
index 997eccd82daa..000000000000
--- a/content/canvas/test/test_2d.line.join.invalid.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.join.invalid - bug 401788</title>
-<!-- Testing: Setting lineJoin to invalid values is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.lineJoin = 'bevel'
-ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
-
-ctx.lineJoin = 'bevel';
-ctx.lineJoin = 'invalid';
-ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
-
-ctx.lineJoin = 'bevel';
-ctx.lineJoin = 'ROUND';
-ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
-
-ctx.lineJoin = 'bevel';
-ctx.lineJoin = 'round\0';
-ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
-
-ctx.lineJoin = 'bevel';
-ctx.lineJoin = 'round ';
-ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
-
-ctx.lineJoin = 'bevel';
-ctx.lineJoin = "";
-ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
-
-ctx.lineJoin = 'bevel';
-ctx.lineJoin = 'butt';
-ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.join.miter.html b/content/canvas/test/test_2d.line.join.miter.html
deleted file mode 100644
index 0ee1b35a3f2f..000000000000
--- a/content/canvas/test/test_2d.line.join.miter.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.join.miter</title>
-<!-- Testing: lineJoin 'miter' is rendered correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.join.open.html b/content/canvas/test/test_2d.line.join.open.html
deleted file mode 100644
index fff4d8c6faf6..000000000000
--- a/content/canvas/test/test_2d.line.join.open.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.join.open</title>
-<!-- Testing: Line joins are not drawn at the corner of an unclosed rectangle -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.join.round.html b/content/canvas/test/test_2d.line.join.round.html
deleted file mode 100644
index ffce7958004b..000000000000
--- a/content/canvas/test/test_2d.line.join.round.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.join.round</title>
-<!-- Testing: lineJoin 'round' is rendered correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.miter.acute.html b/content/canvas/test/test_2d.line.miter.acute.html
deleted file mode 100644
index d06a84186437..000000000000
--- a/content/canvas/test/test_2d.line.miter.acute.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.miter.acute</title>
-<!-- Testing: Miter joins are drawn correctly with acute angles -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.lineWidth = 200;
-ctx.lineJoin = 'miter';
-
-ctx.strokeStyle = '#0f0';
-ctx.miterLimit = 2.614;
-ctx.beginPath();
-ctx.moveTo(100, 1000);
-ctx.lineTo(100, 100);
-ctx.lineTo(1000, 1000);
-ctx.stroke();
-
-ctx.strokeStyle = '#f00';
-ctx.miterLimit = 2.613;
-ctx.beginPath();
-ctx.moveTo(100, 1000);
-ctx.lineTo(100, 100);
-ctx.lineTo(1000, 1000);
-ctx.stroke();
-
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.miter.exceeded.html b/content/canvas/test/test_2d.line.miter.exceeded.html
deleted file mode 100644
index a14d5e49cf85..000000000000
--- a/content/canvas/test/test_2d.line.miter.exceeded.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.miter.exceeded</title>
-<!-- Testing: Miter joins are not drawn when the miter limit is exceeded -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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); // slightly non-right-angle to avoid being a special case
-ctx.stroke();
-
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.miter.invalid.html b/content/canvas/test/test_2d.line.miter.invalid.html
deleted file mode 100644
index e013d52ea003..000000000000
--- a/content/canvas/test/test_2d.line.miter.invalid.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.miter.invalid</title>
-<!-- Testing: Setting miterLimit to invalid values is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.miterLimit = 1.5;
-ok(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
-
-ctx.miterLimit = 1.5;
-ctx.miterLimit = 0;
-todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
-
-ctx.miterLimit = 1.5;
-ctx.miterLimit = -1;
-todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
-
-ctx.miterLimit = 1.5;
-ctx.miterLimit = Infinity;
-todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
-
-ctx.miterLimit = 1.5;
-ctx.miterLimit = -Infinity;
-todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
-
-ctx.miterLimit = 1.5;
-ctx.miterLimit = NaN;
-todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.miter.lineedge.html b/content/canvas/test/test_2d.line.miter.lineedge.html
deleted file mode 100644
index f112c46c8560..000000000000
--- a/content/canvas/test/test_2d.line.miter.lineedge.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.miter.lineedge - bug 401791</title>
-<!-- Testing: Miter joins are not drawn when the miter limit is exceeded at the corners of a zero-height rectangle -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.miter.obtuse.html b/content/canvas/test/test_2d.line.miter.obtuse.html
deleted file mode 100644
index 8c6cfdf1bae1..000000000000
--- a/content/canvas/test/test_2d.line.miter.obtuse.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.miter.obtuse</title>
-<!-- Testing: Miter joins are drawn correctly with obtuse angles -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-var x=800;
-var y=300;
-ctx.lineWidth = 1600;
-ctx.lineJoin = 'miter';
-
-ctx.strokeStyle = '#0f0';
-ctx.miterLimit = 1.083;
-ctx.beginPath();
-ctx.moveTo(800, 10000);
-ctx.lineTo(800, 300);
-ctx.lineTo(10000, -8900);
-ctx.stroke();
-
-ctx.strokeStyle = '#f00';
-ctx.miterLimit = 1.082;
-ctx.beginPath();
-ctx.moveTo(800, 10000);
-ctx.lineTo(800, 300);
-ctx.lineTo(10000, -8900);
-ctx.stroke();
-
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.miter.rightangle.html b/content/canvas/test/test_2d.line.miter.rightangle.html
deleted file mode 100644
index 0d2686c361bb..000000000000
--- a/content/canvas/test/test_2d.line.miter.rightangle.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.miter.rightangle - bug 401791</title>
-<!-- Testing: Miter joins are not drawn when the miter limit is exceeded, on exact right angles -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.miter.within.html b/content/canvas/test/test_2d.line.miter.within.html
deleted file mode 100644
index 9f3f59bf8319..000000000000
--- a/content/canvas/test/test_2d.line.miter.within.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.miter.within</title>
-<!-- Testing: Miter joins are drawn when the miter limit is not quite exceeded -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.lineWidth = 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.union.html b/content/canvas/test/test_2d.line.union.html
deleted file mode 100644
index f8158170af85..000000000000
--- a/content/canvas/test/test_2d.line.union.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.union</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.lineWidth = 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.width.basic.html b/content/canvas/test/test_2d.line.width.basic.html
deleted file mode 100644
index 1d25cfd17554..000000000000
--- a/content/canvas/test/test_2d.line.width.basic.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.width.basic</title>
-<!-- Testing: lineWidth determines the width of line strokes -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.width.invalid.html b/content/canvas/test/test_2d.line.width.invalid.html
deleted file mode 100644
index 5e6f71d8fc83..000000000000
--- a/content/canvas/test/test_2d.line.width.invalid.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.width.invalid</title>
-<!-- Testing: Setting lineWidth to invalid values is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.lineWidth = 1.5;
-ok(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
-
-ctx.lineWidth = 1.5;
-ctx.lineWidth = 0;
-todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
-
-ctx.lineWidth = 1.5;
-ctx.lineWidth = -1;
-todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
-
-ctx.lineWidth = 1.5;
-ctx.lineWidth = Infinity;
-todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
-
-ctx.lineWidth = 1.5;
-ctx.lineWidth = -Infinity;
-todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
-
-ctx.lineWidth = 1.5;
-ctx.lineWidth = NaN;
-todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.line.width.transformed.html b/content/canvas/test/test_2d.line.width.transformed.html
deleted file mode 100644
index c10785ab867e..000000000000
--- a/content/canvas/test/test_2d.line.width.transformed.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.line.width.transformed</title>
-<!-- Testing: Line stroke widths are affected by scale transformations -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.missingargs.html b/content/canvas/test/test_2d.missingargs.html
deleted file mode 100644
index 2103d9161fdd..000000000000
--- a/content/canvas/test/test_2d.missingargs.html
+++ /dev/null
@@ -1,294 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.missingargs</title>
-<!-- Testing: Missing arguments cause NOT_SUPPORTED_ERR -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.scale();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.scale(1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.rotate();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.translate();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.translate(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-if (ctx.transform) { // (avoid spurious failures, since the aim here is not to test that all features are supported)
-    var _thrown = undefined; try {
-  ctx.transform();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.transform(1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.transform(1, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.transform(1, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.transform(1, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.transform(1, 0, 0, 1, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-}
-if (ctx.setTransform) {
-    var _thrown = undefined; try {
-  ctx.setTransform();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.setTransform(1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.setTransform(1, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.setTransform(1, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.setTransform(1, 0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.setTransform(1, 0, 0, 1, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-}
-var _thrown = undefined; try {
-  ctx.createLinearGradient();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createLinearGradient(0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createRadialGradient(0, 0, 1, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.createPattern(canvas);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.clearRect();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.clearRect(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.clearRect(0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.clearRect(0, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.fillRect();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.fillRect(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.fillRect(0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.fillRect(0, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.strokeRect();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.strokeRect(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.strokeRect(0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.strokeRect(0, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.moveTo();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.moveTo(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.lineTo();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.lineTo(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.quadraticCurveTo();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.quadraticCurveTo(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.quadraticCurveTo(0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.quadraticCurveTo(0, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.bezierCurveTo();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.bezierCurveTo(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.bezierCurveTo(0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.bezierCurveTo(0, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.bezierCurveTo(0, 0, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.bezierCurveTo(0, 0, 0, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.arcTo();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.arcTo(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.arcTo(0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.arcTo(0, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.arcTo(0, 0, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.rect();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.rect(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.rect(0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.rect(0, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.arc();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.arc(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.arc(0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.arc(0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.arc(0, 0, 1, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.arc(0, 0, 1, 0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-if (ctx.isPointInPath) {
-    var _thrown = undefined; try {
-  ctx.isPointInPath();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.isPointInPath(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-}
-var _thrown = undefined; try {
-  ctx.drawImage();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.drawImage(canvas);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.drawImage(canvas, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-// TODO: n >= 3 args on drawImage could be either a valid overload,
-// or too few for another overload, or too many for another
-// overload - what should happen?
-if (ctx.createImageData) {
-    var _thrown = undefined; try {
-  ctx.createImageData();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.createImageData(1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-}
-if (ctx.getImageData) {
-    var _thrown = undefined; try {
-  ctx.getImageData();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.getImageData(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.getImageData(0, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.getImageData(0, 0, 1);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-}
-if (ctx.putImageData) {
-    var imgdata = ctx.getImageData(0, 0, 1, 1);
-    var _thrown = undefined; try {
-  ctx.putImageData();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.putImageData(imgdata);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-    var _thrown = undefined; try {
-  ctx.putImageData(imgdata, 0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-}
-var g = ctx.createLinearGradient(0, 0, 0, 0);
-var _thrown = undefined; try {
-  g.addColorStop();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  g.addColorStop(0);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.angle.1.html b/content/canvas/test/test_2d.path.arc.angle.1.html
deleted file mode 100644
index 76693e19c2df..000000000000
--- a/content/canvas/test/test_2d.path.arc.angle.1.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.angle.1</title>
-<!-- Testing: arc() draws pi/2 .. -pi anticlockwise correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#f00';
-ctx.beginPath();
-ctx.moveTo(100, 0);
-ctx.arc(100, 0, 150, Math.PI/2, -Math.PI, true);
-ctx.fill();
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.angle.2.html b/content/canvas/test/test_2d.path.arc.angle.2.html
deleted file mode 100644
index c04b04f4aec7..000000000000
--- a/content/canvas/test/test_2d.path.arc.angle.2.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.angle.2</title>
-<!-- Testing: arc() draws -3pi/2 .. -pi anticlockwise correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#f00';
-ctx.beginPath();
-ctx.moveTo(100, 0);
-ctx.arc(100, 0, 150, -3*Math.PI/2, -Math.PI, true);
-ctx.fill();
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.angle.3.html b/content/canvas/test/test_2d.path.arc.angle.3.html
deleted file mode 100644
index 80e3a23c4a3d..000000000000
--- a/content/canvas/test/test_2d.path.arc.angle.3.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.angle.3</title>
-<!-- Testing: arc() wraps angles mod 2pi when anticlockwise and end > start+2pi -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#f00';
-ctx.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,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.angle.4.html b/content/canvas/test/test_2d.path.arc.angle.4.html
deleted file mode 100644
index 50800a44be0e..000000000000
--- a/content/canvas/test/test_2d.path.arc.angle.4.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.angle.4</title>
-<!-- Testing: arc() draws a full circle when clockwise and end > start+2pi -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0f0';
-ctx.beginPath();
-ctx.moveTo(50, 25);
-ctx.arc(50, 25, 60, (512+1/2)*Math.PI, (1024-1)*Math.PI, false);
-ctx.fill();
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.angle.5.html b/content/canvas/test/test_2d.path.arc.angle.5.html
deleted file mode 100644
index 030d29d07079..000000000000
--- a/content/canvas/test/test_2d.path.arc.angle.5.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.angle.5</title>
-<!-- Testing: arc() wraps angles mod 2pi when clockwise and start > end+2pi -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#f00';
-ctx.beginPath();
-ctx.moveTo(100, 0);
-ctx.arc(100, 0, 150, (1024-1)*Math.PI, (512+1/2)*Math.PI, false);
-ctx.fill();
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.angle.6.html b/content/canvas/test/test_2d.path.arc.angle.6.html
deleted file mode 100644
index af90bcd04841..000000000000
--- a/content/canvas/test/test_2d.path.arc.angle.6.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.angle.6</title>
-<!-- Testing: arc() draws a full circle when anticlockwise and start > end+2pi -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0f0';
-ctx.beginPath();
-ctx.moveTo(50, 25);
-ctx.arc(50, 25, 60, (1024-1)*Math.PI, (512+1/2)*Math.PI, true);
-ctx.fill();
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.empty.html b/content/canvas/test/test_2d.path.arc.empty.html
deleted file mode 100644
index aecc9ce08481..000000000000
--- a/content/canvas/test/test_2d.path.arc.empty.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.empty</title>
-<!-- Testing: arc() with an empty path does not draw a straight line to the start point -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 50;
-ctx.strokeStyle = '#f00';
-ctx.beginPath();
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.end.html b/content/canvas/test/test_2d.path.arc.end.html
deleted file mode 100644
index f40494b3dc1f..000000000000
--- a/content/canvas/test/test_2d.path.arc.end.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.end</title>
-<!-- Testing: arc() adds the end point of the arc to the subpath -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 50;
-ctx.strokeStyle = '#0f0';
-ctx.beginPath();
-ctx.moveTo(-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.negative.html b/content/canvas/test/test_2d.path.arc.negative.html
deleted file mode 100644
index 26a9e0fb5026..000000000000
--- a/content/canvas/test/test_2d.path.arc.negative.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.negative</title>
-<!-- Testing: arc() with negative radius throws INDEX_SIZE_ERR -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.arc(0, 0, -1, 0, 0, true);
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.nonempty.html b/content/canvas/test/test_2d.path.arc.nonempty.html
deleted file mode 100644
index 1a5c38f5186f..000000000000
--- a/content/canvas/test/test_2d.path.arc.nonempty.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.nonempty</title>
-<!-- Testing: arc() with a non-empty path does draw a straight line to the start point -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 50;
-ctx.strokeStyle = '#0f0';
-ctx.beginPath();
-ctx.moveTo(0, 25);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.nonfinite.html b/content/canvas/test/test_2d.path.arc.nonfinite.html
deleted file mode 100644
index 5498cfa3e921..000000000000
--- a/content/canvas/test/test_2d.path.arc.nonfinite.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.nonfinite</title>
-<!-- Testing: arc() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.moveTo(0, 0);
-ctx.lineTo(100, 0);
-ctx.arc(Infinity, 50, 0, 2*Math.PI, true);
-ctx.arc(-Infinity, 50, 0, 2*Math.PI, true);
-ctx.arc(NaN, 50, 0, 2*Math.PI, true);
-ctx.arc(0, Infinity, 0, 2*Math.PI, true);
-ctx.arc(0, -Infinity, 0, 2*Math.PI, true);
-ctx.arc(0, NaN, 0, 2*Math.PI, true);
-ctx.arc(0, 50, Infinity, 2*Math.PI, true);
-ctx.arc(0, 50, -Infinity, 2*Math.PI, true);
-ctx.arc(0, 50, NaN, 2*Math.PI, true);
-ctx.arc(0, 50, 0, Infinity, true);
-ctx.arc(0, 50, 0, -Infinity, true);
-ctx.arc(0, 50, 0, NaN, true);
-ctx.arc(Infinity, Infinity, 0, 2*Math.PI, true);
-ctx.arc(Infinity, Infinity, Infinity, 2*Math.PI, true);
-ctx.arc(Infinity, Infinity, Infinity, Infinity, true);
-ctx.arc(Infinity, Infinity, 0, Infinity, true);
-ctx.arc(Infinity, 50, Infinity, 2*Math.PI, true);
-ctx.arc(Infinity, 50, Infinity, Infinity, true);
-ctx.arc(Infinity, 50, 0, Infinity, true);
-ctx.arc(0, Infinity, Infinity, 2*Math.PI, true);
-ctx.arc(0, Infinity, Infinity, Infinity, true);
-ctx.arc(0, Infinity, 0, Infinity, true);
-ctx.arc(0, 50, Infinity, Infinity, true);
-ctx.lineTo(100, 50);
-ctx.lineTo(0, 50);
-ctx.fillStyle = '#0f0';
-ctx.fill();
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 90,45, 0,255,0,255, "90,45", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.scale.1.html b/content/canvas/test/test_2d.path.arc.scale.1.html
deleted file mode 100644
index c9512df0a8fa..000000000000
--- a/content/canvas/test/test_2d.path.arc.scale.1.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.scale.1</title>
-<!-- Testing: Non-uniformly scaled arcs are the right shape -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.scale(2, 0.5);
-ctx.fillStyle = '#0f0';
-ctx.beginPath();
-ctx.arc(25, 50, 56, 0, 2*Math.PI, false);
-ctx.fill();
-ctx.fillStyle = '#f00';
-ctx.beginPath();
-ctx.moveTo(-25, 50);
-ctx.arc(-25, 50, 24, 0, 2*Math.PI, false);
-ctx.moveTo(75, 50);
-ctx.arc(75, 50, 24, 0, 2*Math.PI, false);
-ctx.moveTo(25, -25);
-ctx.arc(25, -25, 24, 0, 2*Math.PI, false);
-ctx.moveTo(25, 125);
-ctx.arc(25, 125, 24, 0, 2*Math.PI, false);
-ctx.fill();
-
-isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 0);
-isPixel(ctx, 50,0, 0,255,0,255, "50,0", "0,255,0,255", 0);
-isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 0);
-isPixel(ctx, 0,25, 0,255,0,255, "0,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 99,25, 0,255,0,255, "99,25", "0,255,0,255", 0);
-isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 0);
-isPixel(ctx, 50,49, 0,255,0,255, "50,49", "0,255,0,255", 0);
-isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.scale.2.html b/content/canvas/test/test_2d.path.arc.scale.2.html
deleted file mode 100644
index 99741068cebd..000000000000
--- a/content/canvas/test/test_2d.path.arc.scale.2.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.scale.2</title>
-<!-- Testing: Highly scaled arcs are the right shape -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.scale(100, 100);
-ctx.strokeStyle = '#0f0';
-ctx.lineWidth = 1.2;
-ctx.beginPath();
-ctx.arc(0, 0, 0.6, 0, Math.PI/2, false);
-ctx.stroke();
-
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
-isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
-isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.selfintersect.1.html b/content/canvas/test/test_2d.path.arc.selfintersect.1.html
deleted file mode 100644
index 75b3d3262d83..000000000000
--- a/content/canvas/test/test_2d.path.arc.selfintersect.1.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.selfintersect.1</title>
-<!-- Testing: arc() with lineWidth > 2*radius is drawn sensibly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.selfintersect.2.html b/content/canvas/test/test_2d.path.arc.selfintersect.2.html
deleted file mode 100644
index b72df3176993..000000000000
--- a/content/canvas/test/test_2d.path.arc.selfintersect.2.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.selfintersect.2</title>
-<!-- Testing: arc() with lineWidth > 2*radius is drawn sensibly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.shape.1.html b/content/canvas/test/test_2d.path.arc.shape.1.html
deleted file mode 100644
index 97f94aa12a72..000000000000
--- a/content/canvas/test/test_2d.path.arc.shape.1.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.shape.1</title>
-<!-- Testing: arc() from 0 to pi does not draw anything in the wrong half -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 50;
-ctx.strokeStyle = '#f00';
-ctx.beginPath();
-ctx.arc(50, 50, 50, 0, Math.PI, false);
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.shape.2.html b/content/canvas/test/test_2d.path.arc.shape.2.html
deleted file mode 100644
index 6451c0c8671e..000000000000
--- a/content/canvas/test/test_2d.path.arc.shape.2.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.shape.2</title>
-<!-- Testing: arc() from 0 to pi draws stuff in the right half -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.shape.4.html b/content/canvas/test/test_2d.path.arc.shape.4.html
deleted file mode 100644
index 9e257fe1a88d..000000000000
--- a/content/canvas/test/test_2d.path.arc.shape.4.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.shape.4</title>
-<!-- Testing: arc() from 0 to -pi/2 draws stuff in the right quadrant -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 150;
-ctx.strokeStyle = '#0f0';
-ctx.beginPath();
-ctx.arc(-50, 50, 100, 0, -Math.PI/2, true);
-ctx.stroke();
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.shape.5.html b/content/canvas/test/test_2d.path.arc.shape.5.html
deleted file mode 100644
index 4a8325de3158..000000000000
--- a/content/canvas/test/test_2d.path.arc.shape.5.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.shape.5</title>
-<!-- Testing: arc() from 0 to 5pi does not draw crazy things -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 200;
-ctx.strokeStyle = '#f00';
-ctx.beginPath();
-ctx.arc(300, 0, 100, 0, 5*Math.PI, false);
-ctx.stroke();
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.twopie.1.html b/content/canvas/test/test_2d.path.arc.twopie.1.html
deleted file mode 100644
index a6c292ae888e..000000000000
--- a/content/canvas/test/test_2d.path.arc.twopie.1.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.twopie.1</title>
-<!-- Testing: arc() draws nothing when end = start + 2pi-e and anticlockwise -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 100;
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.twopie.2.html b/content/canvas/test/test_2d.path.arc.twopie.2.html
deleted file mode 100644
index 45c2eec3b8cb..000000000000
--- a/content/canvas/test/test_2d.path.arc.twopie.2.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.twopie.2</title>
-<!-- Testing: arc() draws a full circle when end = start + 2pi-e and clockwise -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.twopie.3.html b/content/canvas/test/test_2d.path.arc.twopie.3.html
deleted file mode 100644
index ae6711cff374..000000000000
--- a/content/canvas/test/test_2d.path.arc.twopie.3.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.twopie.3</title>
-<!-- Testing: arc() draws a full circle when end = start + 2pi+e and anticlockwise -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.twopie.4.html b/content/canvas/test/test_2d.path.arc.twopie.4.html
deleted file mode 100644
index ef4de44355ba..000000000000
--- a/content/canvas/test/test_2d.path.arc.twopie.4.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.twopie.4</title>
-<!-- Testing: arc() draws nothing when end = start + 2pi+e and clockwise -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.zero.1.html b/content/canvas/test/test_2d.path.arc.zero.1.html
deleted file mode 100644
index 2a31278d8280..000000000000
--- a/content/canvas/test/test_2d.path.arc.zero.1.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.zero.1</title>
-<!-- Testing: arc() draws nothing when startAngle = endAngle and anticlockwise -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 100;
-ctx.beginPath();
-ctx.arc(50, 25, 50, 0, 0, true);
-ctx.stroke();
-isPixel(ctx, 50,20, 0,255,0,255, "50,20", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.zero.2.html b/content/canvas/test/test_2d.path.arc.zero.2.html
deleted file mode 100644
index c000bac4add6..000000000000
--- a/content/canvas/test/test_2d.path.arc.zero.2.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.zero.2</title>
-<!-- Testing: arc() draws nothing when startAngle = endAngle and clockwise -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 100;
-ctx.beginPath();
-ctx.arc(50, 25, 50, 0, 0, false);
-ctx.stroke();
-isPixel(ctx, 50,20, 0,255,0,255, "50,20", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arc.zeroradius.html b/content/canvas/test/test_2d.path.arc.zeroradius.html
deleted file mode 100644
index 45324e5ea8ba..000000000000
--- a/content/canvas/test/test_2d.path.arc.zeroradius.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arc.zeroradius</title>
-<!-- Testing: arc() with zero radius draws a line to the start point -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00'
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 50;
-ctx.strokeStyle = '#0f0';
-ctx.beginPath();
-ctx.moveTo(0, 25);
-ctx.arc(200, 25, 0, 0, Math.PI, true);
-ctx.stroke();
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.coincide.1.html b/content/canvas/test/test_2d.path.arcTo.coincide.1.html
deleted file mode 100644
index cf2789dcad11..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.coincide.1.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.coincide.1</title>
-<!-- Testing: arcTo() has no effect if P0 = P1 -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 50;
-
-ctx.strokeStyle = '#0f0';
-ctx.beginPath();
-ctx.moveTo(0, 25);
-ctx.arcTo(0, 25, 50, 1000, 1);
-ctx.lineTo(100, 25);
-ctx.stroke();
-
-ctx.strokeStyle = '#f00';
-ctx.beginPath();
-ctx.moveTo(50, 25);
-ctx.arcTo(50, 25, 100, 25, 1);
-ctx.stroke();
-
-isPixel(ctx, 50,1, 0,255,0,255, "50,1", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 50,48, 0,255,0,255, "50,48", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.coincide.2.html b/content/canvas/test/test_2d.path.arcTo.coincide.2.html
deleted file mode 100644
index 8230815694c4..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.coincide.2.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.coincide.2</title>
-<!-- Testing: arcTo() draws a straight line to P1 if P1 = P2 -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 50;
-ctx.strokeStyle = '#0f0';
-ctx.beginPath();
-ctx.moveTo(0, 25);
-ctx.arcTo(100, 25, 100, 25, 1);
-ctx.stroke();
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.collinear.1.html b/content/canvas/test/test_2d.path.arcTo.collinear.1.html
deleted file mode 100644
index ce1b5b0bdc51..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.collinear.1.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.collinear.1</title>
-<!-- Testing: arcTo() with all points on a line, and P1 between P0/P2, draws a straight line to P1 -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 50;
-
-ctx.strokeStyle = '#0f0';
-ctx.beginPath();
-ctx.moveTo(0, 25);
-ctx.arcTo(100, 25, 200, 25, 1);
-ctx.stroke();
-
-ctx.strokeStyle = '#f00';
-ctx.beginPath();
-ctx.moveTo(-100, 25);
-ctx.arcTo(0, 25, 100, 25, 1);
-ctx.stroke();
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.collinear.2.html b/content/canvas/test/test_2d.path.arcTo.collinear.2.html
deleted file mode 100644
index f8cccd869980..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.collinear.2.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.collinear.2</title>
-<!-- Testing: arcTo() with all points on a line, and P2 between P0/P1, draws an infinite line along P1..P2 -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 50;
-
-ctx.strokeStyle = '#0f0';
-ctx.beginPath();
-ctx.moveTo(1000, 25);
-ctx.arcTo(1100, 25, 1050, 25, 1);
-ctx.stroke();
-
-ctx.strokeStyle = '#f00';
-ctx.beginPath();
-ctx.moveTo(0, 25);
-ctx.arcTo(100, 25, -50, 25, 1);
-ctx.stroke();
-
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.collinear.3.html b/content/canvas/test/test_2d.path.arcTo.collinear.3.html
deleted file mode 100644
index 5ec335a8fcae..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.collinear.3.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.collinear.3</title>
-<!-- Testing: arcTo() with all points on a line, and P0 between P1/P2, draws an infinite line along P1..P2 -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 50;
-
-ctx.strokeStyle = '#0f0';
-ctx.beginPath();
-ctx.moveTo(150, 25);
-ctx.arcTo(200, 25, 100, 25, 1);
-ctx.stroke();
-
-ctx.strokeStyle = '#f00';
-ctx.beginPath();
-ctx.moveTo(0, 25);
-ctx.arcTo(100, 25, 50, 25, 1);
-ctx.stroke();
-
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.emptysubpath.html b/content/canvas/test/test_2d.path.arcTo.emptysubpath.html
deleted file mode 100644
index 1243f03c1486..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.emptysubpath.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.emptysubpath</title>
-<!-- Testing: arcTo() does nothing if there are no subpaths -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 50;
-ctx.strokeStyle = '#f00';
-ctx.beginPath();
-ctx.arcTo(0, 25, 0, 25, 0.1);
-ctx.arcTo(100, 25, 100, 25, 0.1);
-ctx.stroke();
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.negative.html b/content/canvas/test/test_2d.path.arcTo.negative.html
deleted file mode 100644
index f4475a425cf6..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.negative.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.negative</title>
-<!-- Testing: arcTo() with negative radius throws an exception -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.arcTo(0, 0, 0, 0, -1);
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.nonfinite.html b/content/canvas/test/test_2d.path.arcTo.nonfinite.html
deleted file mode 100644
index 5030ed8e1337..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.nonfinite.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.nonfinite</title>
-<!-- Testing: arcTo() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.moveTo(0, 0);
-ctx.lineTo(100, 0);
-ctx.arcTo(Infinity, 50, 0, 50, 0);
-ctx.arcTo(-Infinity, 50, 0, 50, 0);
-ctx.arcTo(NaN, 50, 0, 50, 0);
-ctx.arcTo(0, Infinity, 0, 50, 0);
-ctx.arcTo(0, -Infinity, 0, 50, 0);
-ctx.arcTo(0, NaN, 0, 50, 0);
-ctx.arcTo(0, 50, Infinity, 50, 0);
-ctx.arcTo(0, 50, -Infinity, 50, 0);
-ctx.arcTo(0, 50, NaN, 50, 0);
-ctx.arcTo(0, 50, 0, Infinity, 0);
-ctx.arcTo(0, 50, 0, -Infinity, 0);
-ctx.arcTo(0, 50, 0, NaN, 0);
-ctx.arcTo(0, 50, 0, 50, Infinity);
-ctx.arcTo(0, 50, 0, 50, -Infinity);
-ctx.arcTo(0, 50, 0, 50, NaN);
-ctx.arcTo(Infinity, Infinity, 0, 50, 0);
-ctx.arcTo(Infinity, Infinity, Infinity, 50, 0);
-ctx.arcTo(Infinity, Infinity, Infinity, Infinity, 0);
-ctx.arcTo(Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.arcTo(Infinity, Infinity, Infinity, 50, Infinity);
-ctx.arcTo(Infinity, Infinity, 0, Infinity, 0);
-ctx.arcTo(Infinity, Infinity, 0, Infinity, Infinity);
-ctx.arcTo(Infinity, Infinity, 0, 50, Infinity);
-ctx.arcTo(Infinity, 50, Infinity, 50, 0);
-ctx.arcTo(Infinity, 50, Infinity, Infinity, 0);
-ctx.arcTo(Infinity, 50, Infinity, Infinity, Infinity);
-ctx.arcTo(Infinity, 50, Infinity, 50, Infinity);
-ctx.arcTo(Infinity, 50, 0, Infinity, 0);
-ctx.arcTo(Infinity, 50, 0, Infinity, Infinity);
-ctx.arcTo(Infinity, 50, 0, 50, Infinity);
-ctx.arcTo(0, Infinity, Infinity, 50, 0);
-ctx.arcTo(0, Infinity, Infinity, Infinity, 0);
-ctx.arcTo(0, Infinity, Infinity, Infinity, Infinity);
-ctx.arcTo(0, Infinity, Infinity, 50, Infinity);
-ctx.arcTo(0, Infinity, 0, Infinity, 0);
-ctx.arcTo(0, Infinity, 0, Infinity, Infinity);
-ctx.arcTo(0, Infinity, 0, 50, Infinity);
-ctx.arcTo(0, 50, Infinity, Infinity, 0);
-ctx.arcTo(0, 50, Infinity, Infinity, Infinity);
-ctx.arcTo(0, 50, Infinity, 50, Infinity);
-ctx.arcTo(0, 50, 0, Infinity, Infinity);
-ctx.lineTo(100, 50);
-ctx.lineTo(0, 50);
-ctx.fillStyle = '#0f0';
-ctx.fill();
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 90,45, 0,255,0,255, "90,45", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.scale.html b/content/canvas/test/test_2d.path.arcTo.scale.html
deleted file mode 100644
index 1ebea96ff5d4..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.scale.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.scale</title>
-<!-- Testing: arcTo scales the curve, not just the control points -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#0f0';
-ctx.beginPath();
-ctx.moveTo(0, 50);
-ctx.translate(100, 0);
-ctx.scale(0.1, 1);
-ctx.arcTo(50, 50, 50, 0, 50);
-ctx.lineTo(-1000, 0);
-ctx.fill();
-
-isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 0);
-isPixel(ctx, 50,0, 0,255,0,255, "50,0", "0,255,0,255", 0);
-isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 0);
-isPixel(ctx, 0,25, 0,255,0,255, "0,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 99,25, 0,255,0,255, "99,25", "0,255,0,255", 0);
-isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 0);
-isPixel(ctx, 50,49, 0,255,0,255, "50,49", "0,255,0,255", 0);
-isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.shape.curve1.html b/content/canvas/test/test_2d.path.arcTo.shape.curve1.html
deleted file mode 100644
index d345690eea17..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.shape.curve1.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.shape.curve1</title>
-<!-- Testing: arcTo() curves in the right kind of shape -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var tol = 1.5; // tolerance to avoid antialiasing artifacts
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 10;
-ctx.beginPath();
-ctx.moveTo(10, 25);
-ctx.arcTo(75, 25, 75, 60, 20);
-ctx.stroke();
-
-ctx.fillStyle = '#0f0';
-ctx.beginPath();
-ctx.rect(10, 20, 45, 10);
-ctx.moveTo(80, 45);
-ctx.arc(55, 45, 25+tol, 0, -Math.PI/2, true);
-ctx.arc(55, 45, 15-tol, -Math.PI/2, 0, false);
-ctx.fill();
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 55,19, 0,255,0,255, "55,19", "0,255,0,255", 0);
-isPixel(ctx, 55,20, 0,255,0,255, "55,20", "0,255,0,255", 0);
-isPixel(ctx, 55,21, 0,255,0,255, "55,21", "0,255,0,255", 0);
-isPixel(ctx, 64,22, 0,255,0,255, "64,22", "0,255,0,255", 0);
-isPixel(ctx, 65,21, 0,255,0,255, "65,21", "0,255,0,255", 0);
-isPixel(ctx, 72,28, 0,255,0,255, "72,28", "0,255,0,255", 0);
-isPixel(ctx, 73,27, 0,255,0,255, "73,27", "0,255,0,255", 0);
-isPixel(ctx, 78,36, 0,255,0,255, "78,36", "0,255,0,255", 0);
-isPixel(ctx, 79,35, 0,255,0,255, "79,35", "0,255,0,255", 0);
-isPixel(ctx, 80,44, 0,255,0,255, "80,44", "0,255,0,255", 0);
-isPixel(ctx, 80,45, 0,255,0,255, "80,45", "0,255,0,255", 0);
-isPixel(ctx, 80,46, 0,255,0,255, "80,46", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.shape.curve2.html b/content/canvas/test/test_2d.path.arcTo.shape.curve2.html
deleted file mode 100644
index 94bdb716cb85..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.shape.curve2.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.shape.curve2</title>
-<!-- Testing: arcTo() curves in the right kind of shape -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var tol = 1.5; // tolerance to avoid antialiasing artifacts
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#f00';
-ctx.beginPath();
-ctx.rect(10, 20, 45, 10);
-ctx.moveTo(80, 45);
-ctx.arc(55, 45, 25-tol, 0, -Math.PI/2, true);
-ctx.arc(55, 45, 15+tol, -Math.PI/2, 0, false);
-ctx.fill();
-
-ctx.strokeStyle = '#0f0';
-ctx.lineWidth = 10;
-ctx.beginPath();
-ctx.moveTo(10, 25);
-ctx.arcTo(75, 25, 75, 60, 20);
-ctx.stroke();
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 55,19, 0,255,0,255, "55,19", "0,255,0,255", 0);
-isPixel(ctx, 55,20, 0,255,0,255, "55,20", "0,255,0,255", 0);
-isPixel(ctx, 55,21, 0,255,0,255, "55,21", "0,255,0,255", 0);
-isPixel(ctx, 64,22, 0,255,0,255, "64,22", "0,255,0,255", 0);
-isPixel(ctx, 65,21, 0,255,0,255, "65,21", "0,255,0,255", 0);
-isPixel(ctx, 72,28, 0,255,0,255, "72,28", "0,255,0,255", 0);
-isPixel(ctx, 73,27, 0,255,0,255, "73,27", "0,255,0,255", 0);
-isPixel(ctx, 78,36, 0,255,0,255, "78,36", "0,255,0,255", 0);
-isPixel(ctx, 79,35, 0,255,0,255, "79,35", "0,255,0,255", 0);
-isPixel(ctx, 80,44, 0,255,0,255, "80,44", "0,255,0,255", 0);
-isPixel(ctx, 80,45, 0,255,0,255, "80,45", "0,255,0,255", 0);
-isPixel(ctx, 80,46, 0,255,0,255, "80,46", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.shape.end.html b/content/canvas/test/test_2d.path.arcTo.shape.end.html
deleted file mode 100644
index 5f679ef599ac..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.shape.end.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.shape.end</title>
-<!-- Testing: arcTo() does not draw anything from P1 to P2 -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 50;
-ctx.beginPath();
-ctx.moveTo(-100, -100);
-ctx.arcTo(-100, 25, 200, 25, 10);
-ctx.stroke();
-
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.shape.start.html b/content/canvas/test/test_2d.path.arcTo.shape.start.html
deleted file mode 100644
index 4a6aa40cb2a9..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.shape.start.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.shape.start</title>
-<!-- Testing: arcTo() draws a straight line from P0 to P1 -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.strokeStyle = '#0f0';
-ctx.lineWidth = 50;
-ctx.beginPath();
-ctx.moveTo(0, 25);
-ctx.arcTo(200, 25, 200, 50, 10);
-ctx.stroke();
-
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.transformation.html b/content/canvas/test/test_2d.path.arcTo.transformation.html
deleted file mode 100644
index 12f656a1a9da..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.transformation.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.transformation</title>
-<!-- Testing: arcTo joins up to the last subpath point correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#0f0';
-ctx.beginPath();
-ctx.moveTo(0, 50);
-ctx.translate(100, 0);
-ctx.arcTo(50, 50, 50, 0, 50);
-ctx.lineTo(-100, 0);
-ctx.fill();
-
-isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 0);
-isPixel(ctx, 50,0, 0,255,0,255, "50,0", "0,255,0,255", 0);
-isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 0);
-isPixel(ctx, 0,25, 0,255,0,255, "0,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 99,25, 0,255,0,255, "99,25", "0,255,0,255", 0);
-isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 0);
-isPixel(ctx, 50,49, 0,255,0,255, "50,49", "0,255,0,255", 0);
-isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.zero.1.html b/content/canvas/test/test_2d.path.arcTo.zero.1.html
deleted file mode 100644
index c4e63271c6c1..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.zero.1.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.zero.1</title>
-<!-- Testing: arcTo() with zero radius draws a straight line from P0 to P1 -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 50;
-
-ctx.strokeStyle = '#0f0';
-ctx.beginPath();
-ctx.moveTo(0, 25);
-ctx.arcTo(100, 25, 100, 100, 0);
-ctx.stroke();
-
-ctx.strokeStyle = '#f00';
-ctx.beginPath();
-ctx.moveTo(0, -25);
-ctx.arcTo(50, -25, 50, 50, 0);
-ctx.stroke();
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-ok(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.arcTo.zero.2.html b/content/canvas/test/test_2d.path.arcTo.zero.2.html
deleted file mode 100644
index 1647a06be5fb..000000000000
--- a/content/canvas/test/test_2d.path.arcTo.zero.2.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.arcTo.zero.2</title>
-<!-- Testing: arcTo() with zero radius draws a straight line from P0 to P1, even when all points are collinear -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.lineWidth = 50;
-
-ctx.strokeStyle = '#0f0';
-ctx.beginPath();
-ctx.moveTo(0, 25);
-ctx.arcTo(100, 25, -100, 25, 0);
-ctx.stroke();
-
-ctx.strokeStyle = '#f00';
-ctx.beginPath();
-ctx.moveTo(100, 25);
-ctx.arcTo(200, 25, 50, 25, 0);
-ctx.stroke();
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-ok(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.beginPath.html b/content/canvas/test/test_2d.path.beginPath.html
deleted file mode 100644
index 99cc3191d535..000000000000
--- a/content/canvas/test/test_2d.path.beginPath.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.beginPath</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.bezierCurveTo.basic.html b/content/canvas/test/test_2d.path.bezierCurveTo.basic.html
deleted file mode 100644
index bdaa58934f7a..000000000000
--- a/content/canvas/test/test_2d.path.bezierCurveTo.basic.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.bezierCurveTo.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.bezierCurveTo.emptysubpath.html b/content/canvas/test/test_2d.path.bezierCurveTo.emptysubpath.html
deleted file mode 100644
index 936940484a8b..000000000000
--- a/content/canvas/test/test_2d.path.bezierCurveTo.emptysubpath.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.bezierCurveTo.emptysubpath</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.bezierCurveTo.nonfinite.html b/content/canvas/test/test_2d.path.bezierCurveTo.nonfinite.html
deleted file mode 100644
index af22a4c4a2f1..000000000000
--- a/content/canvas/test/test_2d.path.bezierCurveTo.nonfinite.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.bezierCurveTo.nonfinite</title>
-<!-- Testing: bezierCurveTo() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.moveTo(0, 0);
-ctx.lineTo(100, 0);
-ctx.bezierCurveTo(Infinity, 50, 0, 50, 0, 50);
-ctx.bezierCurveTo(-Infinity, 50, 0, 50, 0, 50);
-ctx.bezierCurveTo(NaN, 50, 0, 50, 0, 50);
-ctx.bezierCurveTo(0, Infinity, 0, 50, 0, 50);
-ctx.bezierCurveTo(0, -Infinity, 0, 50, 0, 50);
-ctx.bezierCurveTo(0, NaN, 0, 50, 0, 50);
-ctx.bezierCurveTo(0, 50, Infinity, 50, 0, 50);
-ctx.bezierCurveTo(0, 50, -Infinity, 50, 0, 50);
-ctx.bezierCurveTo(0, 50, NaN, 50, 0, 50);
-ctx.bezierCurveTo(0, 50, 0, Infinity, 0, 50);
-ctx.bezierCurveTo(0, 50, 0, -Infinity, 0, 50);
-ctx.bezierCurveTo(0, 50, 0, NaN, 0, 50);
-ctx.bezierCurveTo(0, 50, 0, 50, Infinity, 50);
-ctx.bezierCurveTo(0, 50, 0, 50, -Infinity, 50);
-ctx.bezierCurveTo(0, 50, 0, 50, NaN, 50);
-ctx.bezierCurveTo(0, 50, 0, 50, 0, Infinity);
-ctx.bezierCurveTo(0, 50, 0, 50, 0, -Infinity);
-ctx.bezierCurveTo(0, 50, 0, 50, 0, NaN);
-ctx.bezierCurveTo(Infinity, Infinity, 0, 50, 0, 50);
-ctx.bezierCurveTo(Infinity, Infinity, Infinity, 50, 0, 50);
-ctx.bezierCurveTo(Infinity, Infinity, Infinity, Infinity, 0, 50);
-ctx.bezierCurveTo(Infinity, Infinity, Infinity, Infinity, Infinity, 50);
-ctx.bezierCurveTo(Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.bezierCurveTo(Infinity, Infinity, Infinity, Infinity, 0, Infinity);
-ctx.bezierCurveTo(Infinity, Infinity, Infinity, 50, Infinity, 50);
-ctx.bezierCurveTo(Infinity, Infinity, Infinity, 50, Infinity, Infinity);
-ctx.bezierCurveTo(Infinity, Infinity, Infinity, 50, 0, Infinity);
-ctx.bezierCurveTo(Infinity, Infinity, 0, Infinity, 0, 50);
-ctx.bezierCurveTo(Infinity, Infinity, 0, Infinity, Infinity, 50);
-ctx.bezierCurveTo(Infinity, Infinity, 0, Infinity, Infinity, Infinity);
-ctx.bezierCurveTo(Infinity, Infinity, 0, Infinity, 0, Infinity);
-ctx.bezierCurveTo(Infinity, Infinity, 0, 50, Infinity, 50);
-ctx.bezierCurveTo(Infinity, Infinity, 0, 50, Infinity, Infinity);
-ctx.bezierCurveTo(Infinity, Infinity, 0, 50, 0, Infinity);
-ctx.bezierCurveTo(Infinity, 50, Infinity, 50, 0, 50);
-ctx.bezierCurveTo(Infinity, 50, Infinity, Infinity, 0, 50);
-ctx.bezierCurveTo(Infinity, 50, Infinity, Infinity, Infinity, 50);
-ctx.bezierCurveTo(Infinity, 50, Infinity, Infinity, Infinity, Infinity);
-ctx.bezierCurveTo(Infinity, 50, Infinity, Infinity, 0, Infinity);
-ctx.bezierCurveTo(Infinity, 50, Infinity, 50, Infinity, 50);
-ctx.bezierCurveTo(Infinity, 50, Infinity, 50, Infinity, Infinity);
-ctx.bezierCurveTo(Infinity, 50, Infinity, 50, 0, Infinity);
-ctx.bezierCurveTo(Infinity, 50, 0, Infinity, 0, 50);
-ctx.bezierCurveTo(Infinity, 50, 0, Infinity, Infinity, 50);
-ctx.bezierCurveTo(Infinity, 50, 0, Infinity, Infinity, Infinity);
-ctx.bezierCurveTo(Infinity, 50, 0, Infinity, 0, Infinity);
-ctx.bezierCurveTo(Infinity, 50, 0, 50, Infinity, 50);
-ctx.bezierCurveTo(Infinity, 50, 0, 50, Infinity, Infinity);
-ctx.bezierCurveTo(Infinity, 50, 0, 50, 0, Infinity);
-ctx.bezierCurveTo(0, Infinity, Infinity, 50, 0, 50);
-ctx.bezierCurveTo(0, Infinity, Infinity, Infinity, 0, 50);
-ctx.bezierCurveTo(0, Infinity, Infinity, Infinity, Infinity, 50);
-ctx.bezierCurveTo(0, Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.bezierCurveTo(0, Infinity, Infinity, Infinity, 0, Infinity);
-ctx.bezierCurveTo(0, Infinity, Infinity, 50, Infinity, 50);
-ctx.bezierCurveTo(0, Infinity, Infinity, 50, Infinity, Infinity);
-ctx.bezierCurveTo(0, Infinity, Infinity, 50, 0, Infinity);
-ctx.bezierCurveTo(0, Infinity, 0, Infinity, 0, 50);
-ctx.bezierCurveTo(0, Infinity, 0, Infinity, Infinity, 50);
-ctx.bezierCurveTo(0, Infinity, 0, Infinity, Infinity, Infinity);
-ctx.bezierCurveTo(0, Infinity, 0, Infinity, 0, Infinity);
-ctx.bezierCurveTo(0, Infinity, 0, 50, Infinity, 50);
-ctx.bezierCurveTo(0, Infinity, 0, 50, Infinity, Infinity);
-ctx.bezierCurveTo(0, Infinity, 0, 50, 0, Infinity);
-ctx.bezierCurveTo(0, 50, Infinity, Infinity, 0, 50);
-ctx.bezierCurveTo(0, 50, Infinity, Infinity, Infinity, 50);
-ctx.bezierCurveTo(0, 50, Infinity, Infinity, Infinity, Infinity);
-ctx.bezierCurveTo(0, 50, Infinity, Infinity, 0, Infinity);
-ctx.bezierCurveTo(0, 50, Infinity, 50, Infinity, 50);
-ctx.bezierCurveTo(0, 50, Infinity, 50, Infinity, Infinity);
-ctx.bezierCurveTo(0, 50, Infinity, 50, 0, Infinity);
-ctx.bezierCurveTo(0, 50, 0, Infinity, Infinity, 50);
-ctx.bezierCurveTo(0, 50, 0, Infinity, Infinity, Infinity);
-ctx.bezierCurveTo(0, 50, 0, Infinity, 0, Infinity);
-ctx.bezierCurveTo(0, 50, 0, 50, Infinity, Infinity);
-ctx.lineTo(100, 50);
-ctx.lineTo(0, 50);
-ctx.fillStyle = '#0f0';
-ctx.fill();
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 90,45, 0,255,0,255, "90,45", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.bezierCurveTo.scaled.html b/content/canvas/test/test_2d.path.bezierCurveTo.scaled.html
deleted file mode 100644
index 72434d4ed283..000000000000
--- a/content/canvas/test/test_2d.path.bezierCurveTo.scaled.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.bezierCurveTo.scaled</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.bezierCurveTo.shape.html b/content/canvas/test/test_2d.path.bezierCurveTo.shape.html
deleted file mode 100644
index 2f2e581ff05b..000000000000
--- a/content/canvas/test/test_2d.path.bezierCurveTo.shape.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.bezierCurveTo.shape</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.clip.basic.1.html b/content/canvas/test/test_2d.path.clip.basic.1.html
deleted file mode 100644
index 5e673d71df1b..000000000000
--- a/content/canvas/test/test_2d.path.clip.basic.1.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.clip.basic.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.beginPath();
-ctx.rect(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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.clip.basic.2.html b/content/canvas/test/test_2d.path.clip.basic.2.html
deleted file mode 100644
index 97c8d159afdf..000000000000
--- a/content/canvas/test/test_2d.path.clip.basic.2.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.clip.basic.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.beginPath();
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.clip.empty.html b/content/canvas/test/test_2d.path.clip.empty.html
deleted file mode 100644
index d31fcd523a8a..000000000000
--- a/content/canvas/test/test_2d.path.clip.empty.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.clip.empty</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.beginPath();
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.clip.intersect.html b/content/canvas/test/test_2d.path.clip.intersect.html
deleted file mode 100644
index 0629ee4af86b..000000000000
--- a/content/canvas/test/test_2d.path.clip.intersect.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.clip.intersect</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.beginPath();
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.clip.unaffected.html b/content/canvas/test/test_2d.path.clip.unaffected.html
deleted file mode 100644
index aabde93f9e26..000000000000
--- a/content/canvas/test/test_2d.path.clip.unaffected.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.clip.unaffected</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#0f0';
-
-ctx.beginPath();
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.clip.winding.1.html b/content/canvas/test/test_2d.path.clip.winding.1.html
deleted file mode 100644
index 701898d4a498..000000000000
--- a/content/canvas/test/test_2d.path.clip.winding.1.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.clip.winding.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.beginPath();
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.clip.winding.2.html b/content/canvas/test/test_2d.path.clip.winding.2.html
deleted file mode 100644
index 6a2ac33a047b..000000000000
--- a/content/canvas/test/test_2d.path.clip.winding.2.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.clip.winding.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.beginPath();
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.closePath.empty.html b/content/canvas/test/test_2d.path.closePath.empty.html
deleted file mode 100644
index e05411657855..000000000000
--- a/content/canvas/test/test_2d.path.closePath.empty.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.closePath.empty</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.closePath();
-ctx.fillStyle = '#f00';
-ctx.fill();
-isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.closePath.newline.html b/content/canvas/test/test_2d.path.closePath.newline.html
deleted file mode 100644
index ee8c37b91ab3..000000000000
--- a/content/canvas/test/test_2d.path.closePath.newline.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.closePath.newline</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.closePath.nextpoint.html b/content/canvas/test/test_2d.path.closePath.nextpoint.html
deleted file mode 100644
index ac130793fa8e..000000000000
--- a/content/canvas/test/test_2d.path.closePath.nextpoint.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.closePath.nextpoint</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.fill.closed.basic.html b/content/canvas/test/test_2d.path.fill.closed.basic.html
deleted file mode 100644
index 3ded10b78a4b..000000000000
--- a/content/canvas/test/test_2d.path.fill.closed.basic.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.fill.closed.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#0f0';
-ctx.moveTo(0, 0);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.fill.closed.unaffected.html b/content/canvas/test/test_2d.path.fill.closed.unaffected.html
deleted file mode 100644
index 988ec47ba187..000000000000
--- a/content/canvas/test/test_2d.path.fill.closed.unaffected.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.fill.closed.unaffected</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.fill.overlap.html b/content/canvas/test/test_2d.path.fill.overlap.html
deleted file mode 100644
index 0b2f8d4cadd5..000000000000
--- a/content/canvas/test/test_2d.path.fill.overlap.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.fill.overlap</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#000';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
-ctx.rect(0, 0, 100, 50);
-ctx.closePath();
-ctx.rect(10, 10, 80, 30);
-ctx.fill();
-
-isPixel(ctx, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.fill.winding.add.html b/content/canvas/test/test_2d.path.fill.winding.add.html
deleted file mode 100644
index 0bcc4c49a70f..000000000000
--- a/content/canvas/test/test_2d.path.fill.winding.add.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.fill.winding.add</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#0f0';
-ctx.moveTo(-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.fill.winding.subtract.1.html b/content/canvas/test/test_2d.path.fill.winding.subtract.1.html
deleted file mode 100644
index 8d16af801d59..000000000000
--- a/content/canvas/test/test_2d.path.fill.winding.subtract.1.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.fill.winding.subtract.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#f00';
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.fill.winding.subtract.2.html b/content/canvas/test/test_2d.path.fill.winding.subtract.2.html
deleted file mode 100644
index 3810b6cedadd..000000000000
--- a/content/canvas/test/test_2d.path.fill.winding.subtract.2.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.fill.winding.subtract.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#f00';
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.fill.winding.subtract.3.html b/content/canvas/test/test_2d.path.fill.winding.subtract.3.html
deleted file mode 100644
index 309b996f2fc3..000000000000
--- a/content/canvas/test/test_2d.path.fill.winding.subtract.3.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.fill.winding.subtract.3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#0f0';
-ctx.moveTo(-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.initial.html b/content/canvas/test/test_2d.path.initial.html
deleted file mode 100644
index befb11e0553b..000000000000
--- a/content/canvas/test/test_2d.path.initial.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.initial</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.arc.html b/content/canvas/test/test_2d.path.isPointInPath.arc.html
deleted file mode 100644
index b70094455c53..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.arc.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.arc</title>
-<!-- Testing: isPointInPath() works on arcs -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.arc(50, 25, 10, 0, Math.PI, false);
-ok(ctx.isPointInPath(50, 10) === false, "ctx.isPointInPath(50, 10) === false");
-ok(ctx.isPointInPath(50, 20) === false, "ctx.isPointInPath(50, 20) === false");
-ok(ctx.isPointInPath(50, 30) === true, "ctx.isPointInPath(50, 30) === true");
-ok(ctx.isPointInPath(50, 40) === false, "ctx.isPointInPath(50, 40) === false");
-ok(ctx.isPointInPath(30, 20) === false, "ctx.isPointInPath(30, 20) === false");
-ok(ctx.isPointInPath(70, 20) === false, "ctx.isPointInPath(70, 20) === false");
-ok(ctx.isPointInPath(30, 30) === false, "ctx.isPointInPath(30, 30) === false");
-ok(ctx.isPointInPath(70, 30) === false, "ctx.isPointInPath(70, 30) === false");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.basic.1.html b/content/canvas/test/test_2d.path.isPointInPath.basic.1.html
deleted file mode 100644
index 0d60b11a884d..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.basic.1.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.basic.1</title>
-<!-- Testing: isPointInPath() detects whether the point is inside the path -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.rect(0, 0, 20, 20);
-ok(ctx.isPointInPath(10, 10) === true, "ctx.isPointInPath(10, 10) === true");
-ok(ctx.isPointInPath(30, 10) === false, "ctx.isPointInPath(30, 10) === false");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.basic.2.html b/content/canvas/test/test_2d.path.isPointInPath.basic.2.html
deleted file mode 100644
index dc47ac2a02a2..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.basic.2.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.basic.2</title>
-<!-- Testing: isPointInPath() detects whether the point is inside the path -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.rect(20, 0, 20, 20);
-ok(ctx.isPointInPath(10, 10) === false, "ctx.isPointInPath(10, 10) === false");
-ok(ctx.isPointInPath(30, 10) === true, "ctx.isPointInPath(30, 10) === true");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.bezier.html b/content/canvas/test/test_2d.path.isPointInPath.bezier.html
deleted file mode 100644
index 94ecfea5220f..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.bezier.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.bezier</title>
-<!-- Testing: isPointInPath() works on Bezier curves -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.moveTo(25, 25);
-ctx.bezierCurveTo(50, -50, 50, 100, 75, 25);
-ok(ctx.isPointInPath(25, 20) == false, "ctx.isPointInPath(25, 20) == false");
-ok(ctx.isPointInPath(25, 30) == false, "ctx.isPointInPath(25, 30) == false");
-ok(ctx.isPointInPath(30, 20) == true, "ctx.isPointInPath(30, 20) == true");
-ok(ctx.isPointInPath(30, 30) == false, "ctx.isPointInPath(30, 30) == false");
-ok(ctx.isPointInPath(40, 2) == false, "ctx.isPointInPath(40, 2) == false");
-ok(ctx.isPointInPath(40, 20) == true, "ctx.isPointInPath(40, 20) == true");
-ok(ctx.isPointInPath(40, 30) == false, "ctx.isPointInPath(40, 30) == false");
-ok(ctx.isPointInPath(40, 47) == false, "ctx.isPointInPath(40, 47) == false");
-ok(ctx.isPointInPath(45, 20) == true, "ctx.isPointInPath(45, 20) == true");
-ok(ctx.isPointInPath(45, 30) == false, "ctx.isPointInPath(45, 30) == false");
-ok(ctx.isPointInPath(55, 20) == false, "ctx.isPointInPath(55, 20) == false");
-ok(ctx.isPointInPath(55, 30) == true, "ctx.isPointInPath(55, 30) == true");
-ok(ctx.isPointInPath(60, 2) == false, "ctx.isPointInPath(60, 2) == false");
-ok(ctx.isPointInPath(60, 20) == false, "ctx.isPointInPath(60, 20) == false");
-ok(ctx.isPointInPath(60, 30) == true, "ctx.isPointInPath(60, 30) == true");
-ok(ctx.isPointInPath(60, 47) == false, "ctx.isPointInPath(60, 47) == false");
-ok(ctx.isPointInPath(70, 20) == false, "ctx.isPointInPath(70, 20) == false");
-ok(ctx.isPointInPath(70, 30) == true, "ctx.isPointInPath(70, 30) == true");
-ok(ctx.isPointInPath(75, 20) == false, "ctx.isPointInPath(75, 20) == false");
-ok(ctx.isPointInPath(75, 30) == false, "ctx.isPointInPath(75, 30) == false");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.bigarc.html b/content/canvas/test/test_2d.path.isPointInPath.bigarc.html
deleted file mode 100644
index 83d4018729c1..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.bigarc.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.bigarc</title>
-<!-- Testing: isPointInPath() works on unclosed arcs larger than 2pi -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.arc(50, 25, 10, 0, 7, false);
-ok(ctx.isPointInPath(50, 10) === false, "ctx.isPointInPath(50, 10) === false");
-ok(ctx.isPointInPath(50, 20) === true, "ctx.isPointInPath(50, 20) === true");
-ok(ctx.isPointInPath(50, 30) === true, "ctx.isPointInPath(50, 30) === true");
-ok(ctx.isPointInPath(50, 40) === false, "ctx.isPointInPath(50, 40) === false");
-ok(ctx.isPointInPath(30, 20) === false, "ctx.isPointInPath(30, 20) === false");
-ok(ctx.isPointInPath(70, 20) === false, "ctx.isPointInPath(70, 20) === false");
-ok(ctx.isPointInPath(30, 30) === false, "ctx.isPointInPath(30, 30) === false");
-ok(ctx.isPointInPath(70, 30) === false, "ctx.isPointInPath(70, 30) === false");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.edge.html b/content/canvas/test/test_2d.path.isPointInPath.edge.html
deleted file mode 100644
index 5646eec5877e..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.edge.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.edge</title>
-<!-- Testing: isPointInPath() counts points on the path as being inside -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.rect(0, 0, 20, 20);
-ok(ctx.isPointInPath(0, 0) === true, "ctx.isPointInPath(0, 0) === true");
-ok(ctx.isPointInPath(10, 0) === true, "ctx.isPointInPath(10, 0) === true");
-ok(ctx.isPointInPath(20, 0) === true, "ctx.isPointInPath(20, 0) === true");
-ok(ctx.isPointInPath(20, 10) === true, "ctx.isPointInPath(20, 10) === true");
-ok(ctx.isPointInPath(20, 20) === true, "ctx.isPointInPath(20, 20) === true");
-ok(ctx.isPointInPath(10, 20) === true, "ctx.isPointInPath(10, 20) === true");
-ok(ctx.isPointInPath(0, 20) === true, "ctx.isPointInPath(0, 20) === true");
-ok(ctx.isPointInPath(0, 10) === true, "ctx.isPointInPath(0, 10) === true");
-ok(ctx.isPointInPath(10, -0.01) === false, "ctx.isPointInPath(10, -0.01) === false");
-ok(ctx.isPointInPath(10, 20.01) === false, "ctx.isPointInPath(10, 20.01) === false");
-ok(ctx.isPointInPath(-0.01, 10) === false, "ctx.isPointInPath(-0.01, 10) === false");
-ok(ctx.isPointInPath(20.01, 10) === false, "ctx.isPointInPath(20.01, 10) === false");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.empty.html b/content/canvas/test/test_2d.path.isPointInPath.empty.html
deleted file mode 100644
index e4158c59ebc3..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.empty.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.empty</title>
-<!-- Testing: isPointInPath() works when there is no path -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(ctx.isPointInPath(0, 0) === false, "ctx.isPointInPath(0, 0) === false");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.nonfinite.html b/content/canvas/test/test_2d.path.isPointInPath.nonfinite.html
deleted file mode 100644
index 02c0363af712..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.nonfinite.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.nonfinite</title>
-<!-- Testing: isPointInPath() returns false for non-finite arguments -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.rect(-100, -50, 200, 100);
-ok(ctx.isPointInPath(Infinity, 0) === false, "ctx.isPointInPath(Infinity, 0) === false");
-ok(ctx.isPointInPath(-Infinity, 0) === false, "ctx.isPointInPath(-Infinity, 0) === false");
-ok(ctx.isPointInPath(NaN, 0) === false, "ctx.isPointInPath(NaN, 0) === false");
-ok(ctx.isPointInPath(0, Infinity) === false, "ctx.isPointInPath(0, Infinity) === false");
-ok(ctx.isPointInPath(0, -Infinity) === false, "ctx.isPointInPath(0, -Infinity) === false");
-ok(ctx.isPointInPath(0, NaN) === false, "ctx.isPointInPath(0, NaN) === false");
-ok(ctx.isPointInPath(NaN, NaN) === false, "ctx.isPointInPath(NaN, NaN) === false");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.outside.html b/content/canvas/test/test_2d.path.isPointInPath.outside.html
deleted file mode 100644
index 8eecad76bb43..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.outside.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.outside</title>
-<!-- Testing: isPointInPath() works on paths outside the canvas -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.rect(0, -100, 20, 20);
-ctx.rect(20, -10, 20, 20);
-ok(ctx.isPointInPath(10, -110) === false, "ctx.isPointInPath(10, -110) === false");
-ok(ctx.isPointInPath(10, -90) === true, "ctx.isPointInPath(10, -90) === true");
-ok(ctx.isPointInPath(10, -70) === false, "ctx.isPointInPath(10, -70) === false");
-ok(ctx.isPointInPath(30, -20) === false, "ctx.isPointInPath(30, -20) === false");
-ok(ctx.isPointInPath(30, 0) === true, "ctx.isPointInPath(30, 0) === true");
-ok(ctx.isPointInPath(30, 20) === false, "ctx.isPointInPath(30, 20) === false");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.subpath.html b/content/canvas/test/test_2d.path.isPointInPath.subpath.html
deleted file mode 100644
index 0d7e94c88bfb..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.subpath.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.subpath</title>
-<!-- Testing: isPointInPath() uses the current path, not just the subpath -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.rect(0, 0, 20, 20);
-ctx.beginPath();
-ctx.rect(20, 0, 20, 20);
-ctx.closePath();
-ctx.rect(40, 0, 20, 20);
-ok(ctx.isPointInPath(10, 10) === false, "ctx.isPointInPath(10, 10) === false");
-ok(ctx.isPointInPath(30, 10) === true, "ctx.isPointInPath(30, 10) === true");
-ok(ctx.isPointInPath(50, 10) === true, "ctx.isPointInPath(50, 10) === true");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.transform.1.html b/content/canvas/test/test_2d.path.isPointInPath.transform.1.html
deleted file mode 100644
index 4bca86bc72fc..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.transform.1.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.transform.1 - bug 405300</title>
-<!-- Testing: isPointInPath() handles transformations correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.transform.2.html b/content/canvas/test/test_2d.path.isPointInPath.transform.2.html
deleted file mode 100644
index 92b5a976f30f..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.transform.2.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.transform.2 - bug 405300</title>
-<!-- Testing: isPointInPath() handles transformations correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.rect(50, 0, 20, 20);
-ctx.translate(50, 0);
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.transform.3.html b/content/canvas/test/test_2d.path.isPointInPath.transform.3.html
deleted file mode 100644
index ae7de84aa3f0..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.transform.3.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.transform.3 - bug 405300</title>
-<!-- Testing: isPointInPath() handles transformations correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.unclosed.html b/content/canvas/test/test_2d.path.isPointInPath.unclosed.html
deleted file mode 100644
index b7cb5c328a5a..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.unclosed.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.unclosed</title>
-<!-- Testing: isPointInPath() works on unclosed subpaths -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.moveTo(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");
-ok(ctx.isPointInPath(30, 10) === false, "ctx.isPointInPath(30, 10) === false");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.isPointInPath.winding.html b/content/canvas/test/test_2d.path.isPointInPath.winding.html
deleted file mode 100644
index 902546de752d..000000000000
--- a/content/canvas/test/test_2d.path.isPointInPath.winding.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.isPointInPath.winding</title>
-<!-- Testing: isPointInPath() uses the non-zero winding number rule -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// Create a square ring, using opposite windings to make a hole in the centre
-ctx.moveTo(0, 0);
-ctx.lineTo(50, 0);
-ctx.lineTo(50, 50);
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.lineTo.basic.html b/content/canvas/test/test_2d.path.lineTo.basic.html
deleted file mode 100644
index 7fc0ea283643..000000000000
--- a/content/canvas/test/test_2d.path.lineTo.basic.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.lineTo.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.lineTo.emptysubpath.html b/content/canvas/test/test_2d.path.lineTo.emptysubpath.html
deleted file mode 100644
index d0b0cf2877ab..000000000000
--- a/content/canvas/test/test_2d.path.lineTo.emptysubpath.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.lineTo.emptysubpath</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.lineTo.nextpoint.html b/content/canvas/test/test_2d.path.lineTo.nextpoint.html
deleted file mode 100644
index fdc96eb123c1..000000000000
--- a/content/canvas/test/test_2d.path.lineTo.nextpoint.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.lineTo.nextpoint</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.lineTo.nonfinite.html b/content/canvas/test/test_2d.path.lineTo.nonfinite.html
deleted file mode 100644
index 95d398fd3315..000000000000
--- a/content/canvas/test/test_2d.path.lineTo.nonfinite.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.lineTo.nonfinite</title>
-<!-- Testing: lineTo() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.moveTo(0, 0);
-ctx.lineTo(100, 0);
-ctx.lineTo(Infinity, 50);
-ctx.lineTo(-Infinity, 50);
-ctx.lineTo(NaN, 50);
-ctx.lineTo(0, Infinity);
-ctx.lineTo(0, -Infinity);
-ctx.lineTo(0, NaN);
-ctx.lineTo(Infinity, Infinity);
-ctx.lineTo(100, 50);
-ctx.lineTo(0, 50);
-ctx.fillStyle = '#0f0';
-ctx.fill();
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 90,45, 0,255,0,255, "90,45", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.moveTo.basic.html b/content/canvas/test/test_2d.path.moveTo.basic.html
deleted file mode 100644
index a8b1d248972e..000000000000
--- a/content/canvas/test/test_2d.path.moveTo.basic.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.moveTo.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.moveTo.multiple.html b/content/canvas/test/test_2d.path.moveTo.multiple.html
deleted file mode 100644
index 9e7ca5bc8a57..000000000000
--- a/content/canvas/test/test_2d.path.moveTo.multiple.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.moveTo.multiple</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.moveTo.newsubpath.html b/content/canvas/test/test_2d.path.moveTo.newsubpath.html
deleted file mode 100644
index 4270cc5f1cd7..000000000000
--- a/content/canvas/test/test_2d.path.moveTo.newsubpath.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.moveTo.newsubpath</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.moveTo.nonfinite.html b/content/canvas/test/test_2d.path.moveTo.nonfinite.html
deleted file mode 100644
index f5829321728a..000000000000
--- a/content/canvas/test/test_2d.path.moveTo.nonfinite.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.moveTo.nonfinite</title>
-<!-- Testing: moveTo() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.moveTo(0, 0);
-ctx.lineTo(100, 0);
-ctx.moveTo(Infinity, 50);
-ctx.moveTo(-Infinity, 50);
-ctx.moveTo(NaN, 50);
-ctx.moveTo(0, Infinity);
-ctx.moveTo(0, -Infinity);
-ctx.moveTo(0, NaN);
-ctx.moveTo(Infinity, Infinity);
-ctx.lineTo(100, 50);
-ctx.lineTo(0, 50);
-ctx.fillStyle = '#0f0';
-ctx.fill();
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.quadraticCurveTo.basic.html b/content/canvas/test/test_2d.path.quadraticCurveTo.basic.html
deleted file mode 100644
index 0d6eac74120e..000000000000
--- a/content/canvas/test/test_2d.path.quadraticCurveTo.basic.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.quadraticCurveTo.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.quadraticCurveTo.emptysubpath.html b/content/canvas/test/test_2d.path.quadraticCurveTo.emptysubpath.html
deleted file mode 100644
index 1b90b3a8f838..000000000000
--- a/content/canvas/test/test_2d.path.quadraticCurveTo.emptysubpath.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.quadraticCurveTo.emptysubpath</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.quadraticCurveTo.nonfinite.html b/content/canvas/test/test_2d.path.quadraticCurveTo.nonfinite.html
deleted file mode 100644
index dd0fbb483545..000000000000
--- a/content/canvas/test/test_2d.path.quadraticCurveTo.nonfinite.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.quadraticCurveTo.nonfinite</title>
-<!-- Testing: quadraticCurveTo() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.moveTo(0, 0);
-ctx.lineTo(100, 0);
-ctx.quadraticCurveTo(Infinity, 50, 0, 50);
-ctx.quadraticCurveTo(-Infinity, 50, 0, 50);
-ctx.quadraticCurveTo(NaN, 50, 0, 50);
-ctx.quadraticCurveTo(0, Infinity, 0, 50);
-ctx.quadraticCurveTo(0, -Infinity, 0, 50);
-ctx.quadraticCurveTo(0, NaN, 0, 50);
-ctx.quadraticCurveTo(0, 50, Infinity, 50);
-ctx.quadraticCurveTo(0, 50, -Infinity, 50);
-ctx.quadraticCurveTo(0, 50, NaN, 50);
-ctx.quadraticCurveTo(0, 50, 0, Infinity);
-ctx.quadraticCurveTo(0, 50, 0, -Infinity);
-ctx.quadraticCurveTo(0, 50, 0, NaN);
-ctx.quadraticCurveTo(Infinity, Infinity, 0, 50);
-ctx.quadraticCurveTo(Infinity, Infinity, Infinity, 50);
-ctx.quadraticCurveTo(Infinity, Infinity, Infinity, Infinity);
-ctx.quadraticCurveTo(Infinity, Infinity, 0, Infinity);
-ctx.quadraticCurveTo(Infinity, 50, Infinity, 50);
-ctx.quadraticCurveTo(Infinity, 50, Infinity, Infinity);
-ctx.quadraticCurveTo(Infinity, 50, 0, Infinity);
-ctx.quadraticCurveTo(0, Infinity, Infinity, 50);
-ctx.quadraticCurveTo(0, Infinity, Infinity, Infinity);
-ctx.quadraticCurveTo(0, Infinity, 0, Infinity);
-ctx.quadraticCurveTo(0, 50, Infinity, Infinity);
-ctx.lineTo(100, 50);
-ctx.lineTo(0, 50);
-ctx.fillStyle = '#0f0';
-ctx.fill();
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 90,45, 0,255,0,255, "90,45", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.quadraticCurveTo.scaled.html b/content/canvas/test/test_2d.path.quadraticCurveTo.scaled.html
deleted file mode 100644
index aef6f9b0dbfc..000000000000
--- a/content/canvas/test/test_2d.path.quadraticCurveTo.scaled.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.quadraticCurveTo.scaled</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.quadraticCurveTo.shape.html b/content/canvas/test/test_2d.path.quadraticCurveTo.shape.html
deleted file mode 100644
index b420592131dd..000000000000
--- a/content/canvas/test/test_2d.path.quadraticCurveTo.shape.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.quadraticCurveTo.shape</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.rect.basic.html b/content/canvas/test/test_2d.path.rect.basic.html
deleted file mode 100644
index e1b35a10fec9..000000000000
--- a/content/canvas/test/test_2d.path.rect.basic.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.rect.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.rect(0, 0, 100, 50);
-ctx.fill();
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.rect.closed.html b/content/canvas/test/test_2d.path.rect.closed.html
deleted file mode 100644
index b7d191fdd0bf..000000000000
--- a/content/canvas/test/test_2d.path.rect.closed.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.rect.closed</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.rect.end.1.html b/content/canvas/test/test_2d.path.rect.end.1.html
deleted file mode 100644
index 4c7541206fa0..000000000000
--- a/content/canvas/test/test_2d.path.rect.end.1.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.rect.end.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.rect.end.2.html b/content/canvas/test/test_2d.path.rect.end.2.html
deleted file mode 100644
index 00164cc9422b..000000000000
--- a/content/canvas/test/test_2d.path.rect.end.2.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.rect.end.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.rect.negative.html b/content/canvas/test/test_2d.path.rect.negative.html
deleted file mode 100644
index 0ffdc7ac4461..000000000000
--- a/content/canvas/test/test_2d.path.rect.negative.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.rect.negative</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.beginPath();
-ctx.fillStyle = '#0f0';
-ctx.rect(0, 0, 50, 25);
-ctx.rect(100, 0, -50, 25);
-ctx.rect(0, 50, 50, -25);
-ctx.rect(100, 50, -50, -25);
-ctx.fill();
-isPixel(ctx, 25,12, 0,255,0,255, "25,12", "0,255,0,255", 0);
-isPixel(ctx, 75,12, 0,255,0,255, "75,12", "0,255,0,255", 0);
-isPixel(ctx, 25,37, 0,255,0,255, "25,37", "0,255,0,255", 0);
-isPixel(ctx, 75,37, 0,255,0,255, "75,37", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.rect.newsubpath.html b/content/canvas/test/test_2d.path.rect.newsubpath.html
deleted file mode 100644
index 1df57b34c546..000000000000
--- a/content/canvas/test/test_2d.path.rect.newsubpath.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.rect.newsubpath</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.rect.nonfinite.html b/content/canvas/test/test_2d.path.rect.nonfinite.html
deleted file mode 100644
index 2f676e38cda4..000000000000
--- a/content/canvas/test/test_2d.path.rect.nonfinite.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.rect.nonfinite</title>
-<!-- Testing: rect() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.moveTo(0, 0);
-ctx.lineTo(100, 0);
-ctx.rect(Infinity, 50, 1, 1);
-ctx.rect(-Infinity, 50, 1, 1);
-ctx.rect(NaN, 50, 1, 1);
-ctx.rect(0, Infinity, 1, 1);
-ctx.rect(0, -Infinity, 1, 1);
-ctx.rect(0, NaN, 1, 1);
-ctx.rect(0, 50, Infinity, 1);
-ctx.rect(0, 50, -Infinity, 1);
-ctx.rect(0, 50, NaN, 1);
-ctx.rect(0, 50, 1, Infinity);
-ctx.rect(0, 50, 1, -Infinity);
-ctx.rect(0, 50, 1, NaN);
-ctx.rect(Infinity, Infinity, 1, 1);
-ctx.rect(Infinity, Infinity, Infinity, 1);
-ctx.rect(Infinity, Infinity, Infinity, Infinity);
-ctx.rect(Infinity, Infinity, 1, Infinity);
-ctx.rect(Infinity, 50, Infinity, 1);
-ctx.rect(Infinity, 50, Infinity, Infinity);
-ctx.rect(Infinity, 50, 1, Infinity);
-ctx.rect(0, Infinity, Infinity, 1);
-ctx.rect(0, Infinity, Infinity, Infinity);
-ctx.rect(0, Infinity, 1, Infinity);
-ctx.rect(0, 50, Infinity, Infinity);
-ctx.lineTo(100, 50);
-ctx.lineTo(0, 50);
-ctx.fillStyle = '#0f0';
-ctx.fill();
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 90,45, 0,255,0,255, "90,45", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.rect.winding.html b/content/canvas/test/test_2d.path.rect.winding.html
deleted file mode 100644
index 0ae1895e7623..000000000000
--- a/content/canvas/test/test_2d.path.rect.winding.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.rect.winding</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.beginPath();
-ctx.fillStyle = '#f00';
-ctx.rect(0, 0, 50, 50);
-ctx.rect(100, 50, -50, -50);
-ctx.rect(0, 25, 100, -25);
-ctx.rect(100, 25, -100, 25);
-ctx.fill();
-isPixel(ctx, 25,12, 0,255,0,255, "25,12", "0,255,0,255", 0);
-isPixel(ctx, 75,12, 0,255,0,255, "75,12", "0,255,0,255", 0);
-isPixel(ctx, 25,37, 0,255,0,255, "25,37", "0,255,0,255", 0);
-isPixel(ctx, 75,37, 0,255,0,255, "75,37", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.rect.zero.1.html b/content/canvas/test/test_2d.path.rect.zero.1.html
deleted file mode 100644
index 0a2661397a98..000000000000
--- a/content/canvas/test/test_2d.path.rect.zero.1.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.rect.zero.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.rect.zero.2.html b/content/canvas/test/test_2d.path.rect.zero.2.html
deleted file mode 100644
index 6eb3f327d345..000000000000
--- a/content/canvas/test/test_2d.path.rect.zero.2.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.rect.zero.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.rect.zero.3.html b/content/canvas/test/test_2d.path.rect.zero.3.html
deleted file mode 100644
index abbb579c2aff..000000000000
--- a/content/canvas/test/test_2d.path.rect.zero.3.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.rect.zero.3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.rect.zero.4.html b/content/canvas/test/test_2d.path.rect.zero.4.html
deleted file mode 100644
index 3fdac34f468e..000000000000
--- a/content/canvas/test/test_2d.path.rect.zero.4.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.rect.zero.4</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.rect.zero.5.html b/content/canvas/test/test_2d.path.rect.zero.5.html
deleted file mode 100644
index 02af9794012f..000000000000
--- a/content/canvas/test/test_2d.path.rect.zero.5.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.rect.zero.5</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.stroke.empty.html b/content/canvas/test/test_2d.path.stroke.empty.html
deleted file mode 100644
index d5272a1fc1a0..000000000000
--- a/content/canvas/test/test_2d.path.stroke.empty.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.stroke.empty</title>
-<!-- Testing: Empty subpaths are not stroked -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 100;
-ctx.lineCap = 'round';
-ctx.lineJoin = 'round';
-
-ctx.beginPath();
-ctx.moveTo(40, 25);
-ctx.moveTo(60, 25);
-ctx.stroke();
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.stroke.overlap.html b/content/canvas/test/test_2d.path.stroke.overlap.html
deleted file mode 100644
index d47b851454f0..000000000000
--- a/content/canvas/test/test_2d.path.stroke.overlap.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.stroke.overlap</title>
-<!-- Testing: Stroked subpaths are combined before being drawn -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#000';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.strokeStyle = 'rgba(0, 255, 0, 0.5)';
-ctx.lineWidth = 50;
-ctx.moveTo(0, 20);
-ctx.lineTo(100, 20);
-ctx.moveTo(0, 30);
-ctx.lineTo(100, 30);
-ctx.stroke();
-
-isPixel(ctx, 50,25, 0,127,0,255, "50,25", "0,127,0,255", 1);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.stroke.prune.arc.html b/content/canvas/test/test_2d.path.stroke.prune.arc.html
deleted file mode 100644
index cbd5cd05d2fe..000000000000
--- a/content/canvas/test/test_2d.path.stroke.prune.arc.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.stroke.prune.arc</title>
-<!-- Testing: Zero-length line segments from arcTo and arc are removed before stroking -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 100;
-ctx.lineCap = 'round';
-ctx.lineJoin = 'round';
-
-ctx.beginPath();
-ctx.moveTo(50, 25);
-ctx.arcTo(50, 25, 150, 25, 10);
-ctx.stroke();
-
-ctx.beginPath();
-ctx.moveTo(50, 25);
-ctx.arc(50, 25, 10, 0, 0, false);
-ctx.stroke();
-
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.stroke.prune.closed.html b/content/canvas/test/test_2d.path.stroke.prune.closed.html
deleted file mode 100644
index 38ee53a80162..000000000000
--- a/content/canvas/test/test_2d.path.stroke.prune.closed.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.stroke.prune.closed</title>
-<!-- Testing: Zero-length line segments from closed paths are removed before stroking -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 100;
-ctx.lineCap = 'round';
-ctx.lineJoin = 'round';
-
-ctx.beginPath();
-ctx.moveTo(50, 25);
-ctx.lineTo(50, 25);
-ctx.closePath();
-ctx.stroke();
-
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.stroke.prune.corner.html b/content/canvas/test/test_2d.path.stroke.prune.corner.html
deleted file mode 100644
index 979b13d63006..000000000000
--- a/content/canvas/test/test_2d.path.stroke.prune.corner.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.stroke.prune.corner</title>
-<!-- Testing: Zero-length line segments are removed before stroking with miters -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 400;
-ctx.lineJoin = 'miter';
-ctx.miterLimit = 1.4;
-
-ctx.beginPath();
-ctx.moveTo(-1000, 200, 0, 0);
-ctx.lineTo(-100, 200);
-ctx.lineTo(-100, 200);
-ctx.lineTo(-100, 200);
-ctx.lineTo(-100, 1000);
-ctx.stroke();
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.stroke.prune.curve.html b/content/canvas/test/test_2d.path.stroke.prune.curve.html
deleted file mode 100644
index 8af463ff4d2c..000000000000
--- a/content/canvas/test/test_2d.path.stroke.prune.curve.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.stroke.prune.curve</title>
-<!-- Testing: Zero-length line segments from quadraticCurveTo and bezierCurveTo are removed before stroking -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 100;
-ctx.lineCap = 'round';
-ctx.lineJoin = 'round';
-
-ctx.beginPath();
-ctx.moveTo(50, 25);
-ctx.quadraticCurveTo(50, 25, 50, 25);
-ctx.stroke();
-
-ctx.beginPath();
-ctx.moveTo(50, 25);
-ctx.bezierCurveTo(50, 25, 50, 25, 50, 25);
-ctx.stroke();
-
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.stroke.prune.line.html b/content/canvas/test/test_2d.path.stroke.prune.line.html
deleted file mode 100644
index dc7dc2303086..000000000000
--- a/content/canvas/test/test_2d.path.stroke.prune.line.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.stroke.prune.line</title>
-<!-- Testing: Zero-length line segments from lineTo are removed before stroking -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 100;
-ctx.lineCap = 'round';
-ctx.lineJoin = 'round';
-
-ctx.beginPath();
-ctx.moveTo(50, 25);
-ctx.lineTo(50, 25);
-ctx.stroke();
-
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.stroke.prune.rect.html b/content/canvas/test/test_2d.path.stroke.prune.rect.html
deleted file mode 100644
index ecb10148c2b2..000000000000
--- a/content/canvas/test/test_2d.path.stroke.prune.rect.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.stroke.prune.rect</title>
-<!-- Testing: Zero-length line segments from rect and strokeRect are removed before stroking -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 100;
-ctx.lineCap = 'round';
-ctx.lineJoin = 'round';
-
-ctx.beginPath();
-ctx.rect(50, 25, 0, 0);
-ctx.stroke();
-
-ctx.strokeRect(50, 25, 0, 0);
-
-todo_isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.stroke.scale1.html b/content/canvas/test/test_2d.path.stroke.scale1.html
deleted file mode 100644
index d7dc19a7e14a..000000000000
--- a/content/canvas/test/test_2d.path.stroke.scale1.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.stroke.scale1</title>
-<!-- Testing: Stroke line widths are scaled by the current transformation matrix -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.beginPath();
-ctx.rect(25, 12.5, 50, 25);
-ctx.save();
-ctx.scale(50, 25);
-ctx.strokeStyle = '#0f0';
-ctx.stroke();
-ctx.restore();
-
-ctx.beginPath();
-ctx.rect(-25, -12.5, 150, 75);
-ctx.save();
-ctx.scale(50, 25);
-ctx.strokeStyle = '#f00';
-ctx.stroke();
-ctx.restore();
-
-isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 0);
-isPixel(ctx, 50,0, 0,255,0,255, "50,0", "0,255,0,255", 0);
-isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 0);
-isPixel(ctx, 0,25, 0,255,0,255, "0,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 99,25, 0,255,0,255, "99,25", "0,255,0,255", 0);
-isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 0);
-isPixel(ctx, 50,49, 0,255,0,255, "50,49", "0,255,0,255", 0);
-isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.stroke.scale2.html b/content/canvas/test/test_2d.path.stroke.scale2.html
deleted file mode 100644
index 0d0ed66efc76..000000000000
--- a/content/canvas/test/test_2d.path.stroke.scale2.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.stroke.scale2</title>
-<!-- Testing: Stroke line widths are scaled by the current transformation matrix -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.beginPath();
-ctx.rect(25, 12.5, 50, 25);
-ctx.save();
-ctx.rotate(Math.PI/2);
-ctx.scale(25, 50);
-ctx.strokeStyle = '#0f0';
-ctx.stroke();
-ctx.restore();
-
-ctx.beginPath();
-ctx.rect(-25, -12.5, 150, 75);
-ctx.save();
-ctx.rotate(Math.PI/2);
-ctx.scale(25, 50);
-ctx.strokeStyle = '#f00';
-ctx.stroke();
-ctx.restore();
-
-isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 0);
-isPixel(ctx, 50,0, 0,255,0,255, "50,0", "0,255,0,255", 0);
-isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 0);
-isPixel(ctx, 0,25, 0,255,0,255, "0,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 99,25, 0,255,0,255, "99,25", "0,255,0,255", 0);
-isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 0);
-isPixel(ctx, 50,49, 0,255,0,255, "50,49", "0,255,0,255", 0);
-isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.stroke.skew.html b/content/canvas/test/test_2d.path.stroke.skew.html
deleted file mode 100644
index 5035a74e5fc2..000000000000
--- a/content/canvas/test/test_2d.path.stroke.skew.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.stroke.skew</title>
-<!-- Testing: Strokes lines are skewed by the current transformation matrix -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.save();
-ctx.beginPath();
-ctx.moveTo(49, -50);
-ctx.lineTo(201, -50);
-ctx.rotate(Math.PI/4);
-ctx.scale(1, 283);
-ctx.strokeStyle = '#0f0';
-ctx.stroke();
-ctx.restore();
-
-ctx.save();
-ctx.beginPath();
-ctx.translate(-150, 0);
-ctx.moveTo(49, -50);
-ctx.lineTo(199, -50);
-ctx.rotate(Math.PI/4);
-ctx.scale(1, 142);
-ctx.strokeStyle = '#f00';
-ctx.stroke();
-ctx.restore();
-
-ctx.save();
-ctx.beginPath();
-ctx.translate(-150, 0);
-ctx.moveTo(49, -50);
-ctx.lineTo(199, -50);
-ctx.rotate(Math.PI/4);
-ctx.scale(1, 142);
-ctx.strokeStyle = '#f00';
-ctx.stroke();
-ctx.restore();
-
-isPixel(ctx, 0,0, 0,255,0,255, "0,0", "0,255,0,255", 0);
-isPixel(ctx, 50,0, 0,255,0,255, "50,0", "0,255,0,255", 0);
-isPixel(ctx, 99,0, 0,255,0,255, "99,0", "0,255,0,255", 0);
-isPixel(ctx, 0,25, 0,255,0,255, "0,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 99,25, 0,255,0,255, "99,25", "0,255,0,255", 0);
-isPixel(ctx, 0,49, 0,255,0,255, "0,49", "0,255,0,255", 0);
-isPixel(ctx, 50,49, 0,255,0,255, "50,49", "0,255,0,255", 0);
-isPixel(ctx, 99,49, 0,255,0,255, "99,49", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.stroke.unaffected.html b/content/canvas/test/test_2d.path.stroke.unaffected.html
deleted file mode 100644
index 0700d80f6cec..000000000000
--- a/content/canvas/test/test_2d.path.stroke.unaffected.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.stroke.unaffected</title>
-<!-- Testing: Stroking does not start a new path or subpath -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.lineWidth = 50;
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.stroke.union.html b/content/canvas/test/test_2d.path.stroke.union.html
deleted file mode 100644
index 44d863e0fcbd..000000000000
--- a/content/canvas/test/test_2d.path.stroke.union.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.stroke.union</title>
-<!-- Testing: Strokes in opposite directions are unioned, not subtracted -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.transformation.basic.html b/content/canvas/test/test_2d.path.transformation.basic.html
deleted file mode 100644
index 28c066db3c3f..000000000000
--- a/content/canvas/test/test_2d.path.transformation.basic.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.transformation.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.translate(-100, 0);
-ctx.rect(100, 0, 100, 50);
-ctx.translate(0, -100);
-ctx.fillStyle = '#0f0';
-ctx.fill();
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.transformation.changing.html b/content/canvas/test/test_2d.path.transformation.changing.html
deleted file mode 100644
index 7db1a6d52612..000000000000
--- a/content/canvas/test/test_2d.path.transformation.changing.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.transformation.changing</title>
-<!-- Testing: Transformations are applied while building paths, not when drawing -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0f0';
-ctx.moveTo(0, 0);
-ctx.translate(100, 0);
-ctx.lineTo(0, 0);
-ctx.translate(0, 50);
-ctx.lineTo(0, 0);
-ctx.translate(-100, 0);
-ctx.lineTo(0, 0);
-ctx.translate(1000, 1000);
-ctx.rotate(Math.PI/2);
-ctx.scale(0.1, 0.1);
-ctx.fill();
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.path.transformation.multiple.html b/content/canvas/test/test_2d.path.transformation.multiple.html
deleted file mode 100644
index 992b04638170..000000000000
--- a/content/canvas/test/test_2d.path.transformation.multiple.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.transformation.multiple</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.rect(0, 0, 100, 50);
-ctx.fill();
-ctx.translate(-100, 0);
-ctx.fillStyle = '#0f0';
-ctx.fill();
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.pattern.animated.gif.html b/content/canvas/test/test_2d.pattern.animated.gif.html
deleted file mode 100644
index b28ce86ca884..000000000000
--- a/content/canvas/test/test_2d.pattern.animated.gif.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.animated.gif</title>
-<!-- Testing: createPattern() of an animated GIF draws the first frame -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function deferTest() {
-    _deferred = true;
-}
-function wrapFunction(f) {
-    return function () {
-        f.apply(null, arguments);
-        SimpleTest.finish();
-    }
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-deferTest();
-setTimeout(function () {
-    var pattern = ctx.createPattern(document.getElementById('anim-gr.gif'), 'repeat');
-    ctx.fillStyle = pattern;
-    ctx.fillRect(0, 0, 50, 50);
-    setTimeout(wrapFunction(function () {
-        ctx.fillRect(50, 0, 50, 50);
-        todo_isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-        todo_isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-    }), 250);
-}, 250);
-
-
-});
-</script>
-<img src="image_anim-gr.gif" id="anim-gr.gif" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.basic.canvas.html b/content/canvas/test/test_2d.pattern.basic.canvas.html
deleted file mode 100644
index b569552c7e9a..000000000000
--- a/content/canvas/test/test_2d.pattern.basic.canvas.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.basic.canvas</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = 100;
-canvas2.height = 50;
-var ctx2 = canvas2.getContext('2d');
-ctx2.fillStyle = '#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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.pattern.basic.image.html b/content/canvas/test/test_2d.pattern.basic.image.html
deleted file mode 100644
index 96f9010a95ce..000000000000
--- a/content/canvas/test/test_2d.pattern.basic.image.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.basic.image</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-var img = document.getElementById('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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green.png" id="green.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.basic.nocontext.html b/content/canvas/test/test_2d.pattern.basic.nocontext.html
deleted file mode 100644
index aba7dd1cabf1..000000000000
--- a/content/canvas/test/test_2d.pattern.basic.nocontext.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.basic.nocontext</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = 100;
-canvas2.height = 50;
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.pattern.basic.type.html b/content/canvas/test/test_2d.pattern.basic.type.html
deleted file mode 100644
index c67f871071ec..000000000000
--- a/content/canvas/test/test_2d.pattern.basic.type.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.basic.type</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(window.CanvasPattern !== undefined, "window.CanvasPattern !== undefined");
-
-window.CanvasPattern.prototype.thisImplementsCanvasPattern = true;
-
-var img = document.getElementById('green.png');
-var pattern = ctx.createPattern(img, 'no-repeat');
-ok(pattern.thisImplementsCanvasPattern, "pattern.thisImplementsCanvasPattern");
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green.png" id="green.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.basic.zerocanvas.html b/content/canvas/test/test_2d.pattern.basic.zerocanvas.html
deleted file mode 100644
index 42867270acd3..000000000000
--- a/content/canvas/test/test_2d.pattern.basic.zerocanvas.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.basic.zerocanvas</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = 0;
-canvas2.height = 0;
-ok(canvas2.width === 0, "canvas2.width === 0");
-ok(canvas2.height === 0, "canvas2.height === 0");
-var ctx2 = canvas2.getContext('2d');
-ctx2.fillStyle = '#f00';
-ctx2.fillRect(0, 0, 100, 50);
-var pattern = ctx.createPattern(canvas2, 'repeat');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#f00';
-ctx.fillStyle = pattern;
-ctx.fillRect(0, 0, 100, 50);
-
-todo_isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-todo_isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
-todo_isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
-todo_isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.pattern.crosscanvas.html b/content/canvas/test/test_2d.pattern.crosscanvas.html
deleted file mode 100644
index b82e9e5aec06..000000000000
--- a/content/canvas/test/test_2d.pattern.crosscanvas.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.crosscanvas</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green.png" id="green.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.image.broken.html b/content/canvas/test/test_2d.pattern.image.broken.html
deleted file mode 100644
index 47ba8b9db4f6..000000000000
--- a/content/canvas/test/test_2d.pattern.image.broken.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.image.broken</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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");
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_broken.png" id="broken.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.image.incomplete.html b/content/canvas/test/test_2d.pattern.image.incomplete.html
deleted file mode 100644
index 1fe81ed65eb4..000000000000
--- a/content/canvas/test/test_2d.pattern.image.incomplete.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.image.incomplete</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.pattern.image.null.html b/content/canvas/test/test_2d.pattern.image.null.html
deleted file mode 100644
index 76b9ce101e3b..000000000000
--- a/content/canvas/test/test_2d.pattern.image.null.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.image.null</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.createPattern(null, 'repeat');
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.pattern.image.string.html b/content/canvas/test/test_2d.pattern.image.string.html
deleted file mode 100644
index f5f5c094383a..000000000000
--- a/content/canvas/test/test_2d.pattern.image.string.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.image.string</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.createPattern('image_red.png', 'repeat');
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.pattern.image.undefined.html b/content/canvas/test/test_2d.pattern.image.undefined.html
deleted file mode 100644
index 67291ef0cb5b..000000000000
--- a/content/canvas/test/test_2d.pattern.image.undefined.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.image.undefined</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.createPattern(undefined, 'repeat');
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.pattern.modify.canvas1.html b/content/canvas/test/test_2d.pattern.modify.canvas1.html
deleted file mode 100644
index 82d20807109b..000000000000
--- a/content/canvas/test/test_2d.pattern.modify.canvas1.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.modify.canvas1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = 100;
-canvas2.height = 50;
-var ctx2 = canvas2.getContext('2d');
-ctx2.fillStyle = '#0f0';
-ctx2.fillRect(0, 0, 100, 50);
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.pattern.modify.canvas2.html b/content/canvas/test/test_2d.pattern.modify.canvas2.html
deleted file mode 100644
index c15c59e42fbd..000000000000
--- a/content/canvas/test/test_2d.pattern.modify.canvas2.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.modify.canvas2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = 100;
-canvas2.height = 50;
-var ctx2 = canvas2.getContext('2d');
-ctx2.fillStyle = '#0f0';
-ctx2.fillRect(0, 0, 100, 50);
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.pattern.modify.image1.html b/content/canvas/test/test_2d.pattern.modify.image1.html
deleted file mode 100644
index 434b0fe0be65..000000000000
--- a/content/canvas/test/test_2d.pattern.modify.image1.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.modify.image1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function 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';
-
-
-});
-</script>
-<img src="image_green.png" id="green.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.modify.image2.html b/content/canvas/test/test_2d.pattern.modify.image2.html
deleted file mode 100644
index 0e2ff55d2e7d..000000000000
--- a/content/canvas/test/test_2d.pattern.modify.image2.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.modify.image2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function 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';
-
-
-});
-</script>
-<img src="image_green.png" id="green.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.norepeat.basic.html b/content/canvas/test/test_2d.pattern.paint.norepeat.basic.html
deleted file mode 100644
index 1e0a42e2d056..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.norepeat.basic.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.norepeat.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-var img = document.getElementById('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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green.png" id="green.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.norepeat.coord1.html b/content/canvas/test/test_2d.pattern.paint.norepeat.coord1.html
deleted file mode 100644
index 2f1418b20654..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.norepeat.coord1.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.norepeat.coord1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 50, 50);
-ctx.fillStyle = '#f00';
-ctx.fillRect(50, 0, 50, 50);
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green.png" id="green.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.norepeat.coord2.html b/content/canvas/test/test_2d.pattern.paint.norepeat.coord2.html
deleted file mode 100644
index ee7a0ba18cf0..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.norepeat.coord2.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.norepeat.coord2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green.png" id="green.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.norepeat.coord3.html b/content/canvas/test/test_2d.pattern.paint.norepeat.coord3.html
deleted file mode 100644
index 2a86c85c91ce..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.norepeat.coord3.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.norepeat.coord3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red.png" id="red.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.norepeat.outside.html b/content/canvas/test/test_2d.pattern.paint.norepeat.outside.html
deleted file mode 100644
index 466648a70a64..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.norepeat.outside.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.norepeat.outside</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-var img = document.getElementById('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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red.png" id="red.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.orientation.canvas.html b/content/canvas/test/test_2d.pattern.paint.orientation.canvas.html
deleted file mode 100644
index ab2222618469..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.orientation.canvas.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.orientation.canvas</title>
-<!-- Testing: Canvas patterns do not get flipped when painted -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = 100;
-canvas2.height = 50;
-var ctx2 = canvas2.getContext('2d');
-ctx2.fillStyle = '#f00';
-ctx2.fillRect(0, 0, 100, 25);
-ctx2.fillStyle = '#0f0';
-ctx2.fillRect(0, 25, 100, 25);
-
-var pattern = ctx.createPattern(canvas2, 'no-repeat');
-ctx.fillStyle = pattern;
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 25);
-
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.pattern.paint.orientation.image.html b/content/canvas/test/test_2d.pattern.paint.orientation.image.html
deleted file mode 100644
index fb54a5e68ceb..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.orientation.image.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.orientation.image</title>
-<!-- Testing: Image patterns do not get flipped when painted -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-var img = document.getElementById('rrgg-256x256.png');
-var pattern = ctx.createPattern(img, 'no-repeat');
-ctx.fillStyle = pattern;
-ctx.save();
-ctx.translate(0, -103);
-ctx.fillRect(0, 103, 100, 50);
-ctx.restore();
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 25);
-
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-isPixel(ctx, 98,1, 0,255,0,255, "98,1", "0,255,0,255", 0);
-isPixel(ctx, 1,48, 0,255,0,255, "1,48", "0,255,0,255", 0);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_rrgg-256x256.png" id="rrgg-256x256.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.repeat.basic.html b/content/canvas/test/test_2d.pattern.paint.repeat.basic.html
deleted file mode 100644
index c6f4b12fd030..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.repeat.basic.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.repeat.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-var img = document.getElementById('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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green-16x16.png" id="green-16x16.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.repeat.coord1.html b/content/canvas/test/test_2d.pattern.paint.repeat.coord1.html
deleted file mode 100644
index 104b34c0c77a..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.repeat.coord1.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.repeat.coord1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-var img = document.getElementById('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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_rgrg-256x256.png" id="rgrg-256x256.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.repeat.coord2.html b/content/canvas/test/test_2d.pattern.paint.repeat.coord2.html
deleted file mode 100644
index ea7ac6d947b3..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.repeat.coord2.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.repeat.coord2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_ggrr-256x256.png" id="ggrr-256x256.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.repeat.coord3.html b/content/canvas/test/test_2d.pattern.paint.repeat.coord3.html
deleted file mode 100644
index 0bd09bbbc34b..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.repeat.coord3.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.repeat.coord3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_rgrg-256x256.png" id="rgrg-256x256.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.repeat.outside.html b/content/canvas/test/test_2d.pattern.paint.repeat.outside.html
deleted file mode 100644
index 43a3fd1b1282..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.repeat.outside.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.repeat.outside</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-var img = document.getElementById('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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green-16x16.png" id="green-16x16.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.repeatx.basic.html b/content/canvas/test/test_2d.pattern.paint.repeatx.basic.html
deleted file mode 100644
index 0f494ee13017..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.repeatx.basic.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.repeatx.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#f00';
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green-16x16.png" id="green-16x16.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.repeatx.coord1.html b/content/canvas/test/test_2d.pattern.paint.repeatx.coord1.html
deleted file mode 100644
index 7a11711ba8ad..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.repeatx.coord1.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.repeatx.coord1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red-16x16.png" id="red-16x16.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.repeatx.outside.html b/content/canvas/test/test_2d.pattern.paint.repeatx.outside.html
deleted file mode 100644
index 1f774e617f97..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.repeatx.outside.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.repeatx.outside</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red-16x16.png" id="red-16x16.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.repeaty.basic.html b/content/canvas/test/test_2d.pattern.paint.repeaty.basic.html
deleted file mode 100644
index 31baf9b61588..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.repeaty.basic.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.repeaty.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#f00';
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green-16x16.png" id="green-16x16.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.repeaty.coord1.html b/content/canvas/test/test_2d.pattern.paint.repeaty.coord1.html
deleted file mode 100644
index 735c83ab51dc..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.repeaty.coord1.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.repeaty.coord1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red-16x16.png" id="red-16x16.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.paint.repeaty.outside.html b/content/canvas/test/test_2d.pattern.paint.repeaty.outside.html
deleted file mode 100644
index 5cbdeb219083..000000000000
--- a/content/canvas/test/test_2d.pattern.paint.repeaty.outside.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.paint.repeaty.outside</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red-16x16.png" id="red-16x16.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.repeat.case.html b/content/canvas/test/test_2d.pattern.repeat.case.html
deleted file mode 100644
index ad99e1fe2104..000000000000
--- a/content/canvas/test/test_2d.pattern.repeat.case.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.repeat.case</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.createPattern(canvas, "Repeat");
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.pattern.repeat.empty.html b/content/canvas/test/test_2d.pattern.repeat.empty.html
deleted file mode 100644
index b190393a671b..000000000000
--- a/content/canvas/test/test_2d.pattern.repeat.empty.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.repeat.empty</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-var img = document.getElementById('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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green-1x1.png" id="green-1x1.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.repeat.null.html b/content/canvas/test/test_2d.pattern.repeat.null.html
deleted file mode 100644
index 7b13e4c49451..000000000000
--- a/content/canvas/test/test_2d.pattern.repeat.null.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.repeat.null</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-var img = document.getElementById('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);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_green-1x1.png" id="green-1x1.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.pattern.repeat.nullsuffix.html b/content/canvas/test/test_2d.pattern.repeat.nullsuffix.html
deleted file mode 100644
index 746dd386bc24..000000000000
--- a/content/canvas/test/test_2d.pattern.repeat.nullsuffix.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.repeat.nullsuffix</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.createPattern(canvas, "repeat\0");
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.pattern.repeat.undefined.html b/content/canvas/test/test_2d.pattern.repeat.undefined.html
deleted file mode 100644
index a676039dc5f6..000000000000
--- a/content/canvas/test/test_2d.pattern.repeat.undefined.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.repeat.undefined</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.createPattern(canvas, undefined);
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.pattern.repeat.unrecognised.html b/content/canvas/test/test_2d.pattern.repeat.unrecognised.html
deleted file mode 100644
index 66b7f3d3de14..000000000000
--- a/content/canvas/test/test_2d.pattern.repeat.unrecognised.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.pattern.repeat.unrecognised</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.createPattern(canvas, "invalid");
-} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.scaled.html b/content/canvas/test/test_2d.scaled.html
deleted file mode 100644
index 5c80a07f6888..000000000000
--- a/content/canvas/test/test_2d.scaled.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.scaled</title>
-<!-- Testing: CSS-scaled canvases get drawn correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="50" height="25" style="width: 100px; height: 50px"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#00f';
-ctx.fillRect(0, 0, 50, 25);
-ctx.fillStyle = '#0ff';
-ctx.fillRect(0, 0, 25, 10);
-
-todo(false, "test completed successfully"); // (Bug 483989)
-SimpleTest.finish();
-
-});
-
-</script>
diff --git a/content/canvas/test/test_2d.shadow.alpha.1.html b/content/canvas/test/test_2d.shadow.alpha.1.html
deleted file mode 100644
index 02f242f5ff60..000000000000
--- a/content/canvas/test/test_2d.shadow.alpha.1.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.alpha.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowColor = 'rgba(255, 0, 0, 0.01)';
-ctx.shadowOffsetY = 50;
-ctx.fillRect(0, -50, 100, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 4);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.alpha.2.html b/content/canvas/test/test_2d.shadow.alpha.2.html
deleted file mode 100644
index 2daf68f8fdc1..000000000000
--- a/content/canvas/test/test_2d.shadow.alpha.2.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.alpha.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowColor = 'rgba(0, 0, 255, 0.5)';
-ctx.shadowOffsetY = 50;
-ctx.fillRect(0, -50, 100, 50);
-
-isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.alpha.3.html b/content/canvas/test/test_2d.shadow.alpha.3.html
deleted file mode 100644
index 51861b101eb9..000000000000
--- a/content/canvas/test/test_2d.shadow.alpha.3.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.alpha.3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#f00'; // (work around broken Firefox globalAlpha caching)
-ctx.shadowColor = '#00f';
-ctx.shadowOffsetY = 50;
-ctx.globalAlpha = 0.5;
-ctx.fillRect(0, -50, 100, 50);
-
-isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.alpha.4.html b/content/canvas/test/test_2d.shadow.alpha.4.html
deleted file mode 100644
index c31ff336531d..000000000000
--- a/content/canvas/test/test_2d.shadow.alpha.4.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.alpha.4</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#f00'; // (work around broken Firefox globalAlpha caching)
-ctx.shadowColor = 'rgba(0, 0, 255, 0.707)';
-ctx.shadowOffsetY = 50;
-ctx.globalAlpha = 0.707;
-ctx.fillRect(0, -50, 100, 50);
-
-isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.alpha.5.html b/content/canvas/test/test_2d.shadow.alpha.5.html
deleted file mode 100644
index 2abe16202b6c..000000000000
--- a/content/canvas/test/test_2d.shadow.alpha.5.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.alpha.5</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = 'rgba(64, 0, 0, 0.5)';
-ctx.shadowColor = '#00f';
-ctx.shadowOffsetY = 50;
-ctx.fillRect(0, -50, 100, 50);
-
-isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.attributes.shadowBlur.1.html b/content/canvas/test/test_2d.shadow.attributes.shadowBlur.1.html
deleted file mode 100644
index d79a97c32d46..000000000000
--- a/content/canvas/test/test_2d.shadow.attributes.shadowBlur.1.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.attributes.shadowBlur.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.shadowBlur = 1;
-ok(ctx.shadowBlur === 1, "ctx.shadowBlur === 1");
-ctx.shadowBlur = 0.5;
-ok(ctx.shadowBlur === 0.5, "ctx.shadowBlur === 0.5");
-ctx.shadowBlur = 1e6;
-ok(ctx.shadowBlur === 1e6, "ctx.shadowBlur === 1e6");
-ctx.shadowBlur = 1;
-ctx.shadowBlur = -2;
-ok(ctx.shadowBlur === 1, "ctx.shadowBlur === 1");
-ctx.shadowBlur = 0;
-ok(ctx.shadowBlur === 0, "ctx.shadowBlur === 0");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.attributes.shadowBlur.2.html b/content/canvas/test/test_2d.shadow.attributes.shadowBlur.2.html
deleted file mode 100644
index 50f82b6ad27d..000000000000
--- a/content/canvas/test/test_2d.shadow.attributes.shadowBlur.2.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.attributes.shadowBlur.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.shadowBlur = Infinity;
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.shadowBlur = -Infinity;
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.shadowBlur = NaN;
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.attributes.shadowColor.1.html b/content/canvas/test/test_2d.shadow.attributes.shadowColor.1.html
deleted file mode 100644
index 7608598b172d..000000000000
--- a/content/canvas/test/test_2d.shadow.attributes.shadowColor.1.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.attributes.shadowColor.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.shadowColor = 'lime';
-ok(ctx.shadowColor === '#00ff00', "ctx.shadowColor === '#00ff00'");
-ctx.shadowColor = 'RGBA(0,255, 0,0)';
-ok(ctx.shadowColor === 'rgba(0, 255, 0, 0.0)', "ctx.shadowColor === 'rgba(0, 255, 0, 0.0)'");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.attributes.shadowColor.2.html b/content/canvas/test/test_2d.shadow.attributes.shadowColor.2.html
deleted file mode 100644
index 6aeb8bcc29a9..000000000000
--- a/content/canvas/test/test_2d.shadow.attributes.shadowColor.2.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.attributes.shadowColor.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.shadowColor = '#00ff00';
-ctx.shadowColor = 'bogus';
-ok(ctx.shadowColor === '#00ff00', "ctx.shadowColor === '#00ff00'");
-ctx.shadowColor = ctx;
-ok(ctx.shadowColor === '#00ff00', "ctx.shadowColor === '#00ff00'");
-ctx.shadowColor = undefined;
-ok(ctx.shadowColor === '#00ff00', "ctx.shadowColor === '#00ff00'");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.attributes.shadowOffset.1.html b/content/canvas/test/test_2d.shadow.attributes.shadowOffset.1.html
deleted file mode 100644
index 307ad2714894..000000000000
--- a/content/canvas/test/test_2d.shadow.attributes.shadowOffset.1.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.attributes.shadowOffset.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.shadowOffsetX = 1;
-ctx.shadowOffsetY = 2;
-ok(ctx.shadowOffsetX === 1, "ctx.shadowOffsetX === 1");
-ok(ctx.shadowOffsetY === 2, "ctx.shadowOffsetY === 2");
-ctx.shadowOffsetX = 0.5;
-ctx.shadowOffsetY = 0.25;
-ok(ctx.shadowOffsetX === 0.5, "ctx.shadowOffsetX === 0.5");
-ok(ctx.shadowOffsetY === 0.25, "ctx.shadowOffsetY === 0.25");
-ctx.shadowOffsetX = -0.5;
-ctx.shadowOffsetY = -0.25;
-ok(ctx.shadowOffsetX === -0.5, "ctx.shadowOffsetX === -0.5");
-ok(ctx.shadowOffsetY === -0.25, "ctx.shadowOffsetY === -0.25");
-ctx.shadowOffsetX = 1e6;
-ctx.shadowOffsetY = 1e6;
-ok(ctx.shadowOffsetX === 1e6, "ctx.shadowOffsetX === 1e6");
-ok(ctx.shadowOffsetY === 1e6, "ctx.shadowOffsetY === 1e6");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.attributes.shadowOffset.2.html b/content/canvas/test/test_2d.shadow.attributes.shadowOffset.2.html
deleted file mode 100644
index ad833e6f283a..000000000000
--- a/content/canvas/test/test_2d.shadow.attributes.shadowOffset.2.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.attributes.shadowOffset.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  ctx.shadowOffsetX = Infinity;
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.shadowOffsetX = -Infinity;
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.shadowOffsetX = NaN;
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.shadowOffsetY = Infinity;
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.shadowOffsetY = -Infinity;
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-var _thrown = undefined; try {
-  ctx.shadowOffsetY = NaN;
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.basic.1.html b/content/canvas/test/test_2d.shadow.basic.1.html
deleted file mode 100644
index 69b9222f8629..000000000000
--- a/content/canvas/test/test_2d.shadow.basic.1.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.basic.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.shadowColor = '#f00';
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.basic.2.html b/content/canvas/test/test_2d.shadow.basic.2.html
deleted file mode 100644
index 8df62dd83acf..000000000000
--- a/content/canvas/test/test_2d.shadow.basic.2.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.basic.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#f00';
-ctx.shadowColor = '#f00';
-ctx.fillRect(0, -50, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.blur.high.html b/content/canvas/test/test_2d.shadow.blur.high.html
deleted file mode 100644
index 16a9afc59764..000000000000
--- a/content/canvas/test/test_2d.shadow.blur.high.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.blur.high</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#ff0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowColor = '#00f';
-ctx.shadowOffsetY = 0;
-ctx.shadowBlur = 555.6;
-ctx.fillRect(-200, -200, 200, 400);
-
-todo(false, "test completed successfully"); // (Bug 483989)
-SimpleTest.finish();
-
-});
-
-</script>
diff --git a/content/canvas/test/test_2d.shadow.blur.low.html b/content/canvas/test/test_2d.shadow.blur.low.html
deleted file mode 100644
index 4bbba89bdea6..000000000000
--- a/content/canvas/test/test_2d.shadow.blur.low.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.blur.low</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#ff0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowColor = '#00f';
-ctx.shadowOffsetY = 25;
-for (var x = 0; x < 100; ++x) {
-    ctx.save();
-    ctx.beginPath();
-    ctx.rect(x, 0, 1, 50);
-    ctx.clip();
-    ctx.shadowBlur = x;
-    ctx.fillRect(-200, -200, 500, 200);
-    ctx.restore();
-}
-
-todo(false, "test completed successfully"); // (Bug 483989)
-SimpleTest.finish();
-
-});
-</script>
diff --git a/content/canvas/test/test_2d.shadow.canvas.alpha.html b/content/canvas/test/test_2d.shadow.canvas.alpha.html
deleted file mode 100644
index 8c815f040d68..000000000000
--- a/content/canvas/test/test_2d.shadow.canvas.alpha.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.canvas.alpha</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = 100;
-canvas2.height = 50;
-var ctx2 = canvas2.getContext('2d');
-ctx2.fillStyle = 'rgba(255, 0, 0, 0.5)';
-ctx2.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowOffsetY = 50;
-ctx.shadowColor = '#00f';
-ctx.drawImage(canvas2, 0, -50);
-
-isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_transparent50.png" id="transparent50.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.shadow.canvas.basic.html b/content/canvas/test/test_2d.shadow.canvas.basic.html
deleted file mode 100644
index 0a5bfe15013f..000000000000
--- a/content/canvas/test/test_2d.shadow.canvas.basic.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.canvas.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = 100;
-canvas2.height = 50;
-var ctx2 = canvas2.getContext('2d');
-ctx2.fillStyle = '#f00';
-ctx2.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowColor = '#0f0';
-ctx.shadowOffsetY = 50;
-ctx.drawImage(canvas2, 0, -50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.canvas.transparent.1.html b/content/canvas/test/test_2d.shadow.canvas.transparent.1.html
deleted file mode 100644
index 685c6bfb67f4..000000000000
--- a/content/canvas/test/test_2d.shadow.canvas.transparent.1.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.canvas.transparent.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = 100;
-canvas2.height = 50;
-var ctx2 = canvas2.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowColor = '#f00';
-ctx.shadowOffsetY = 50;
-ctx.drawImage(canvas2, 0, -50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.canvas.transparent.2.html b/content/canvas/test/test_2d.shadow.canvas.transparent.2.html
deleted file mode 100644
index 1b05188bd8d2..000000000000
--- a/content/canvas/test/test_2d.shadow.canvas.transparent.2.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.canvas.transparent.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var canvas2 = document.createElement('canvas');
-canvas2.width = 100;
-canvas2.height = 50;
-var ctx2 = canvas2.getContext('2d');
-ctx2.fillStyle = '#f00';
-ctx2.fillRect(0, 0, 50, 50);
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 50, 50);
-ctx.fillStyle = '#f00';
-ctx.fillRect(50, 0, 50, 50);
-ctx.shadowOffsetY = 50;
-ctx.shadowColor = '#0f0';
-ctx.drawImage(canvas2, 50, -50);
-ctx.shadowColor = '#f00';
-ctx.drawImage(canvas2, -50, -50);
-
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.clip.1.html b/content/canvas/test/test_2d.shadow.clip.1.html
deleted file mode 100644
index 9b645b594b3c..000000000000
--- a/content/canvas/test/test_2d.shadow.clip.1.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.clip.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 50, 50);
-ctx.fillStyle = '#f00';
-ctx.fillRect(50, 0, 50, 50);
-
-ctx.save();
-ctx.beginPath();
-ctx.rect(50, 0, 50, 50);
-ctx.clip();
-ctx.shadowColor = '#0f0';
-ctx.shadowOffsetX = 50;
-ctx.fillRect(0, 0, 50, 50);
-ctx.restore();
-
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.clip.2.html b/content/canvas/test/test_2d.shadow.clip.2.html
deleted file mode 100644
index 1be5c8453fff..000000000000
--- a/content/canvas/test/test_2d.shadow.clip.2.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.clip.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 50, 50);
-ctx.fillStyle = '#0f0';
-ctx.fillRect(50, 0, 50, 50);
-
-ctx.save();
-ctx.beginPath();
-ctx.rect(0, 0, 50, 50);
-ctx.clip();
-ctx.shadowColor = '#f00';
-ctx.shadowOffsetX = 50;
-ctx.fillRect(0, 0, 50, 50);
-ctx.restore();
-
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.clip.3.html b/content/canvas/test/test_2d.shadow.clip.3.html
deleted file mode 100644
index ce000e732a89..000000000000
--- a/content/canvas/test/test_2d.shadow.clip.3.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.clip.3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 50, 50);
-ctx.fillStyle = '#0f0';
-ctx.fillRect(50, 0, 50, 50);
-
-ctx.save();
-ctx.beginPath();
-ctx.rect(0, 0, 50, 50);
-ctx.clip();
-ctx.fillStyle = '#f00';
-ctx.shadowColor = '#0f0';
-ctx.shadowOffsetX = 50;
-ctx.fillRect(-50, 0, 50, 50);
-ctx.restore();
-
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.composite.1.html b/content/canvas/test/test_2d.shadow.composite.1.html
deleted file mode 100644
index f2bf36810c4d..000000000000
--- a/content/canvas/test/test_2d.shadow.composite.1.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.composite.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'xor';
-ctx.shadowColor = '#f00';
-ctx.shadowOffsetX = 100;
-ctx.fillStyle = '#0f0';
-ctx.fillRect(-100, 0, 200, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.composite.2.html b/content/canvas/test/test_2d.shadow.composite.2.html
deleted file mode 100644
index 3d56b99812e9..000000000000
--- a/content/canvas/test/test_2d.shadow.composite.2.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.composite.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'xor';
-ctx.shadowColor = '#f00';
-ctx.shadowBlur = 1;
-ctx.fillStyle = '#0f0';
-ctx.fillRect(-10, -10, 120, 70);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.composite.3.html b/content/canvas/test/test_2d.shadow.composite.3.html
deleted file mode 100644
index 77409e81dbe4..000000000000
--- a/content/canvas/test/test_2d.shadow.composite.3.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.composite.3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.globalCompositeOperation = 'xor';
-ctx.shadowColor = '#f00';
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.composite.4.html b/content/canvas/test/test_2d.shadow.composite.4.html
deleted file mode 100644
index f5abd0a02c64..000000000000
--- a/content/canvas/test/test_2d.shadow.composite.4.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.composite.4</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.globalCompositeOperation = 'destination-over';
-ctx.shadowColor = '#0f0';
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.gradient.alpha.html b/content/canvas/test/test_2d.shadow.gradient.alpha.html
deleted file mode 100644
index 3f3a44507cb3..000000000000
--- a/content/canvas/test/test_2d.shadow.gradient.alpha.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.gradient.alpha</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var gradient = ctx.createLinearGradient(0, 0, 100, 0);
-gradient.addColorStop(0, 'rgba(255,0,0,0.5)');
-gradient.addColorStop(1, 'rgba(255,0,0,0.5)');
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowOffsetY = 50;
-ctx.shadowColor = '#00f';
-ctx.fillStyle = gradient;
-ctx.fillRect(0, -50, 100, 50);
-
-isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.gradient.basic.html b/content/canvas/test/test_2d.shadow.gradient.basic.html
deleted file mode 100644
index 704a6cab2cbb..000000000000
--- a/content/canvas/test/test_2d.shadow.gradient.basic.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.gradient.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var gradient = ctx.createLinearGradient(0, 0, 100, 0);
-gradient.addColorStop(0, '#f00');
-gradient.addColorStop(1, '#f00');
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowColor = '#0f0';
-ctx.shadowOffsetY = 50;
-ctx.fillStyle = gradient;
-ctx.fillRect(0, -50, 100, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.gradient.transparent.1.html b/content/canvas/test/test_2d.shadow.gradient.transparent.1.html
deleted file mode 100644
index 674a6e76b9f9..000000000000
--- a/content/canvas/test/test_2d.shadow.gradient.transparent.1.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.gradient.transparent.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var gradient = ctx.createLinearGradient(0, 0, 100, 0);
-gradient.addColorStop(0, 'rgba(0,0,0,0)');
-gradient.addColorStop(1, 'rgba(0,0,0,0)');
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowColor = '#f00';
-ctx.shadowOffsetY = 50;
-ctx.fillStyle = gradient;
-ctx.fillRect(0, -50, 100, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.gradient.transparent.2.html b/content/canvas/test/test_2d.shadow.gradient.transparent.2.html
deleted file mode 100644
index 98696db555fb..000000000000
--- a/content/canvas/test/test_2d.shadow.gradient.transparent.2.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.gradient.transparent.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var gradient = ctx.createLinearGradient(0, 0, 100, 0);
-gradient.addColorStop(0, '#f00');
-gradient.addColorStop(0.499, '#f00');
-gradient.addColorStop(0.5, 'rgba(0,0,0,0)');
-gradient.addColorStop(1, 'rgba(0,0,0,0)');
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 50, 50);
-ctx.fillStyle = '#0f0';
-ctx.fillRect(50, 0, 50, 50);
-ctx.shadowOffsetY = 50;
-ctx.shadowColor = '#0f0';
-ctx.fillStyle = gradient;
-ctx.fillRect(0, -50, 100, 50);
-
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.image.alpha.html b/content/canvas/test/test_2d.shadow.image.alpha.html
deleted file mode 100644
index abeb27b731b7..000000000000
--- a/content/canvas/test/test_2d.shadow.image.alpha.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.image.alpha</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowOffsetY = 50;
-ctx.shadowColor = '#00f';
-ctx.drawImage(document.getElementById('transparent50.png'), 0, -50);
-
-isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_transparent50.png" id="transparent50.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.shadow.image.basic.html b/content/canvas/test/test_2d.shadow.image.basic.html
deleted file mode 100644
index 2d4f80010d6c..000000000000
--- a/content/canvas/test/test_2d.shadow.image.basic.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.image.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowColor = '#0f0';
-ctx.shadowOffsetY = 50;
-ctx.drawImage(document.getElementById('red.png'), 0, -50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red.png" id="red.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.shadow.image.scale.html b/content/canvas/test/test_2d.shadow.image.scale.html
deleted file mode 100644
index 3e0413c6bfa0..000000000000
--- a/content/canvas/test/test_2d.shadow.image.scale.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.image.scale</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowOffsetY = 50;
-ctx.shadowColor = '#0f0';
-ctx.drawImage(document.getElementById('redtransparent.png'), 0, 0, 100, 50, -10, -50, 240, 50);
-
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_redtransparent.png" id="redtransparent.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.shadow.image.section.html b/content/canvas/test/test_2d.shadow.image.section.html
deleted file mode 100644
index 19ee8e745999..000000000000
--- a/content/canvas/test/test_2d.shadow.image.section.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.image.section</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowOffsetY = 50;
-ctx.shadowColor = '#f00';
-ctx.drawImage(document.getElementById('redtransparent.png'), 50, 0, 50, 50, 0, -50, 50, 50);
-
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 2);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 2);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_redtransparent.png" id="redtransparent.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.shadow.image.transparent.1.html b/content/canvas/test/test_2d.shadow.image.transparent.1.html
deleted file mode 100644
index 3a2289e21dac..000000000000
--- a/content/canvas/test/test_2d.shadow.image.transparent.1.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.image.transparent.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowColor = '#f00';
-ctx.shadowOffsetY = 50;
-ctx.drawImage(document.getElementById('transparent.png'), 0, -50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_transparent.png" id="transparent.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.shadow.image.transparent.2.html b/content/canvas/test/test_2d.shadow.image.transparent.2.html
deleted file mode 100644
index cb1ae6ee9721..000000000000
--- a/content/canvas/test/test_2d.shadow.image.transparent.2.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.image.transparent.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 50, 50);
-ctx.fillStyle = '#f00';
-ctx.fillRect(50, 0, 50, 50);
-ctx.shadowOffsetY = 50;
-ctx.shadowColor = '#0f0';
-ctx.drawImage(document.getElementById('redtransparent.png'), 50, -50);
-ctx.shadowColor = '#f00';
-ctx.drawImage(document.getElementById('redtransparent.png'), -50, -50);
-
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_redtransparent.png" id="redtransparent.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.shadow.offset.negativeX.html b/content/canvas/test/test_2d.shadow.offset.negativeX.html
deleted file mode 100644
index d1aaad8275bc..000000000000
--- a/content/canvas/test/test_2d.shadow.offset.negativeX.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.offset.negativeX</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0f0';
-ctx.shadowColor = '#0f0';
-ctx.shadowOffsetX = -50;
-ctx.fillRect(50, 0, 50, 50);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.offset.negativeY.html b/content/canvas/test/test_2d.shadow.offset.negativeY.html
deleted file mode 100644
index dac383138245..000000000000
--- a/content/canvas/test/test_2d.shadow.offset.negativeY.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.offset.negativeY</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0f0';
-ctx.shadowColor = '#0f0';
-ctx.shadowOffsetY = -25;
-ctx.fillRect(0, 25, 100, 25);
-isPixel(ctx, 50,12, 0,255,0,255, "50,12", "0,255,0,255", 0);
-isPixel(ctx, 50,37, 0,255,0,255, "50,37", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.offset.positiveX.html b/content/canvas/test/test_2d.shadow.offset.positiveX.html
deleted file mode 100644
index 58ec97534071..000000000000
--- a/content/canvas/test/test_2d.shadow.offset.positiveX.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.offset.positiveX</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0f0';
-ctx.shadowColor = '#0f0';
-ctx.shadowOffsetX = 50;
-ctx.fillRect(0, 0, 50, 50);
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.offset.positiveY.html b/content/canvas/test/test_2d.shadow.offset.positiveY.html
deleted file mode 100644
index 32aae0182935..000000000000
--- a/content/canvas/test/test_2d.shadow.offset.positiveY.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.offset.positiveY</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.fillStyle = '#0f0';
-ctx.shadowColor = '#0f0';
-ctx.shadowOffsetY = 25;
-ctx.fillRect(0, 0, 100, 25);
-isPixel(ctx, 50,12, 0,255,0,255, "50,12", "0,255,0,255", 0);
-isPixel(ctx, 50,37, 0,255,0,255, "50,37", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.outside.html b/content/canvas/test/test_2d.shadow.outside.html
deleted file mode 100644
index b0dfcb35e708..000000000000
--- a/content/canvas/test/test_2d.shadow.outside.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.outside</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowColor = '#0f0';
-ctx.shadowOffsetX = 100;
-ctx.fillRect(-100, 0, 25, 50);
-ctx.shadowOffsetX = -100;
-ctx.fillRect(175, 0, 25, 50);
-ctx.shadowOffsetX = 0;
-ctx.shadowOffsetY = 100;
-ctx.fillRect(25, -100, 50, 25);
-ctx.shadowOffsetY = -100;
-ctx.fillRect(25, 125, 50, 25);
-isPixel(ctx, 12,25, 0,255,0,255, "12,25", "0,255,0,255", 0);
-isPixel(ctx, 87,25, 0,255,0,255, "87,25", "0,255,0,255", 0);
-isPixel(ctx, 50,12, 0,255,0,255, "50,12", "0,255,0,255", 0);
-isPixel(ctx, 50,37, 0,255,0,255, "50,37", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.pattern.alpha.html b/content/canvas/test/test_2d.shadow.pattern.alpha.html
deleted file mode 100644
index 9530246af74e..000000000000
--- a/content/canvas/test/test_2d.shadow.pattern.alpha.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.pattern.alpha</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var pattern = ctx.createPattern(document.getElementById('transparent50.png'), 'repeat');
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowOffsetY = 50;
-ctx.shadowColor = '#00f';
-ctx.fillStyle = pattern;
-ctx.fillRect(0, -50, 100, 50);
-
-isPixel(ctx, 50,25, 127,0,127,255, "50,25", "127,0,127,255", 2);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_transparent50.png" id="transparent50.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.shadow.pattern.basic.html b/content/canvas/test/test_2d.shadow.pattern.basic.html
deleted file mode 100644
index b35a15134d5f..000000000000
--- a/content/canvas/test/test_2d.shadow.pattern.basic.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.pattern.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var pattern = ctx.createPattern(document.getElementById('red.png'), 'repeat');
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowColor = '#0f0';
-ctx.shadowOffsetY = 50;
-ctx.fillStyle = pattern;
-ctx.fillRect(0, -50, 100, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_red.png" id="red.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.shadow.pattern.transparent.1.html b/content/canvas/test/test_2d.shadow.pattern.transparent.1.html
deleted file mode 100644
index d5488e667f28..000000000000
--- a/content/canvas/test/test_2d.shadow.pattern.transparent.1.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.pattern.transparent.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var pattern = ctx.createPattern(document.getElementById('transparent.png'), 'repeat');
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowColor = '#f00';
-ctx.shadowOffsetY = 50;
-ctx.fillStyle = pattern;
-ctx.fillRect(0, -50, 100, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_transparent.png" id="transparent.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.shadow.pattern.transparent.2.html b/content/canvas/test/test_2d.shadow.pattern.transparent.2.html
deleted file mode 100644
index 6b6f56b08169..000000000000
--- a/content/canvas/test/test_2d.shadow.pattern.transparent.2.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.pattern.transparent.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var pattern = ctx.createPattern(document.getElementById('redtransparent.png'), 'repeat');
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 50, 50);
-ctx.fillStyle = '#0f0';
-ctx.fillRect(50, 0, 50, 50);
-ctx.shadowOffsetY = 50;
-ctx.shadowColor = '#0f0';
-ctx.fillStyle = pattern;
-ctx.fillRect(0, -50, 100, 50);
-
-isPixel(ctx, 25,25, 0,255,0,255, "25,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 75,25, 0,255,0,255, "75,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_redtransparent.png" id="redtransparent.png" class="resource">
-
diff --git a/content/canvas/test/test_2d.shadow.stroke.basic.html b/content/canvas/test/test_2d.shadow.stroke.basic.html
deleted file mode 100644
index 6ec422125862..000000000000
--- a/content/canvas/test/test_2d.shadow.stroke.basic.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.stroke.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.strokeStyle = '#f00';
-ctx.shadowColor = '#0f0';
-ctx.shadowOffsetY = 50;
-ctx.beginPath();
-ctx.lineWidth = 50;
-ctx.moveTo(0, -25);
-ctx.lineTo(100, -25);
-ctx.stroke();
-
-isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.stroke.cap.1.html b/content/canvas/test/test_2d.shadow.stroke.cap.1.html
deleted file mode 100644
index 845248ff77e9..000000000000
--- a/content/canvas/test/test_2d.shadow.stroke.cap.1.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.stroke.cap.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.strokeStyle = '#f00';
-ctx.shadowColor = '#f00';
-ctx.shadowOffsetY = 50;
-ctx.beginPath();
-ctx.lineWidth = 50;
-ctx.lineCap = 'butt';
-ctx.moveTo(-50, -25);
-ctx.lineTo(0, -25);
-ctx.moveTo(100, -25);
-ctx.lineTo(150, -25);
-ctx.stroke();
-
-isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.stroke.cap.2.html b/content/canvas/test/test_2d.shadow.stroke.cap.2.html
deleted file mode 100644
index 92fba3f82a32..000000000000
--- a/content/canvas/test/test_2d.shadow.stroke.cap.2.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.stroke.cap.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.strokeStyle = '#f00';
-ctx.shadowColor = '#0f0';
-ctx.shadowOffsetY = 50;
-ctx.beginPath();
-ctx.lineWidth = 50;
-ctx.lineCap = 'square';
-ctx.moveTo(25, -25);
-ctx.lineTo(75, -25);
-ctx.stroke();
-
-isPixel(ctx, 1,25, 0,255,0,255, "1,25", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 98,25, 0,255,0,255, "98,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.stroke.join.1.html b/content/canvas/test/test_2d.shadow.stroke.join.1.html
deleted file mode 100644
index dc8faa0c3d9a..000000000000
--- a/content/canvas/test/test_2d.shadow.stroke.join.1.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.stroke.join.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.strokeStyle = '#f00';
-ctx.shadowColor = '#f00';
-ctx.shadowOffsetX = 100;
-ctx.lineWidth = 200;
-ctx.lineJoin = 'bevel';
-ctx.beginPath();
-ctx.moveTo(-200, -50);
-ctx.lineTo(-150, -50);
-ctx.lineTo(-151, -100);
-ctx.stroke();
-
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.stroke.join.2.html b/content/canvas/test/test_2d.shadow.stroke.join.2.html
deleted file mode 100644
index 528377b1499e..000000000000
--- a/content/canvas/test/test_2d.shadow.stroke.join.2.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.stroke.join.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 50, 50);
-ctx.fillStyle = '#0f0';
-ctx.fillRect(50, 0, 50, 50);
-ctx.strokeStyle = '#f00';
-ctx.shadowColor = '#0f0';
-ctx.shadowOffsetX = 100;
-ctx.lineWidth = 200;
-ctx.lineJoin = 'miter';
-ctx.beginPath();
-ctx.moveTo(-200, -50);
-ctx.lineTo(-150, -50);
-ctx.lineTo(-151, -100);
-ctx.stroke();
-
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.stroke.join.3.html b/content/canvas/test/test_2d.shadow.stroke.join.3.html
deleted file mode 100644
index ff2d881a9336..000000000000
--- a/content/canvas/test/test_2d.shadow.stroke.join.3.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.stroke.join.3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.strokeStyle = '#f00';
-ctx.shadowColor = '#f00';
-ctx.shadowOffsetX = 100;
-ctx.lineWidth = 200;
-ctx.lineJoin = 'miter';
-ctx.miterLimit = 0.1;
-ctx.beginPath();
-ctx.moveTo(-200, -50);
-ctx.lineTo(-150, -50);
-ctx.lineTo(-151, -100); // (not an exact right angle, to avoid some other bug in Firefox 3)
-ctx.stroke();
-
-isPixel(ctx, 1,1, 0,255,0,255, "1,1", "0,255,0,255", 0);
-isPixel(ctx, 48,48, 0,255,0,255, "48,48", "0,255,0,255", 0);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-isPixel(ctx, 98,48, 0,255,0,255, "98,48", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.transform.1.html b/content/canvas/test/test_2d.shadow.transform.1.html
deleted file mode 100644
index 9ea6c6e8d7c3..000000000000
--- a/content/canvas/test/test_2d.shadow.transform.1.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.transform.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowOffsetY = 50;
-ctx.shadowColor = '#0f0';
-ctx.translate(100, 100);
-ctx.fillRect(-100, -150, 100, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.shadow.transform.2.html b/content/canvas/test/test_2d.shadow.transform.2.html
deleted file mode 100644
index 49535ec0872c..000000000000
--- a/content/canvas/test/test_2d.shadow.transform.2.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.shadow.transform.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.shadowOffsetY = 50;
-ctx.shadowColor = '#0f0';
-ctx.rotate(Math.PI)
-ctx.fillRect(-100, 0, 100, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.bitmap.html b/content/canvas/test/test_2d.state.saverestore.bitmap.html
deleted file mode 100644
index 49fc891ff659..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.bitmap.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.bitmap</title>
-<!-- Testing: save()/restore() does not affect the current bitmap -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.save();
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.clip.html b/content/canvas/test/test_2d.state.saverestore.clip.html
deleted file mode 100644
index babc03d99a71..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.clip.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.clip</title>
-<!-- Testing: save()/restore() affects the clipping path -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.save();
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.fillStyle.html b/content/canvas/test/test_2d.state.saverestore.fillStyle.html
deleted file mode 100644
index ccef3f14c482..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.fillStyle.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.fillStyle</title>
-<!-- Testing: save()/restore() works for fillStyle -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// 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();
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.globalAlpha.html b/content/canvas/test/test_2d.state.saverestore.globalAlpha.html
deleted file mode 100644
index 1790fe8e4c27..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.globalAlpha.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.globalAlpha</title>
-<!-- Testing: save()/restore() works for globalAlpha -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// 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();
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.globalCompositeOperation.html b/content/canvas/test/test_2d.state.saverestore.globalCompositeOperation.html
deleted file mode 100644
index e7e2772d334e..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.globalCompositeOperation.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.globalCompositeOperation</title>
-<!-- Testing: save()/restore() works for globalCompositeOperation -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// 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();
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.lineCap.html b/content/canvas/test/test_2d.state.saverestore.lineCap.html
deleted file mode 100644
index 75e2905406c5..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.lineCap.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.lineCap</title>
-<!-- Testing: save()/restore() works for lineCap -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// 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();
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.lineJoin.html b/content/canvas/test/test_2d.state.saverestore.lineJoin.html
deleted file mode 100644
index f25b8b82ca89..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.lineJoin.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.lineJoin</title>
-<!-- Testing: save()/restore() works for lineJoin -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// 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();
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.lineWidth.html b/content/canvas/test/test_2d.state.saverestore.lineWidth.html
deleted file mode 100644
index 1305167b292b..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.lineWidth.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.lineWidth</title>
-<!-- Testing: save()/restore() works for lineWidth -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// 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();
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.miterLimit.html b/content/canvas/test/test_2d.state.saverestore.miterLimit.html
deleted file mode 100644
index efd43c2a7fc1..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.miterLimit.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.miterLimit</title>
-<!-- Testing: save()/restore() works for miterLimit -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// 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();
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.path.html b/content/canvas/test/test_2d.state.saverestore.path.html
deleted file mode 100644
index 318f15ddf87f..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.path.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.path</title>
-<!-- Testing: save()/restore() does not affect the current path -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.save();
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.shadowBlur.html b/content/canvas/test/test_2d.state.saverestore.shadowBlur.html
deleted file mode 100644
index c73db861fd59..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.shadowBlur.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.shadowBlur</title>
-<!-- Testing: save()/restore() works for shadowBlur -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// 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();
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.shadowColor.html b/content/canvas/test/test_2d.state.saverestore.shadowColor.html
deleted file mode 100644
index e630ce9bc374..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.shadowColor.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.shadowColor</title>
-<!-- Testing: save()/restore() works for shadowColor -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// 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();
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.shadowOffsetX.html b/content/canvas/test/test_2d.state.saverestore.shadowOffsetX.html
deleted file mode 100644
index 38b5fb7c0335..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.shadowOffsetX.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.shadowOffsetX</title>
-<!-- Testing: save()/restore() works for shadowOffsetX -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// 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();
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.shadowOffsetY.html b/content/canvas/test/test_2d.state.saverestore.shadowOffsetY.html
deleted file mode 100644
index 0e8eb20b43dc..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.shadowOffsetY.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.shadowOffsetY</title>
-<!-- Testing: save()/restore() works for shadowOffsetY -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// 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();
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.stack.html b/content/canvas/test/test_2d.state.saverestore.stack.html
deleted file mode 100644
index ca21d1951696..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.stack.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.stack</title>
-<!-- Testing: save()/restore() can be nested as a stack -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.stackdepth.html b/content/canvas/test/test_2d.state.saverestore.stackdepth.html
deleted file mode 100644
index 51a52e09c4d5..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.stackdepth.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.stackdepth</title>
-<!-- Testing: save()/restore() stack depth is not unreasonably limited -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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();
-}
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.strokeStyle.html b/content/canvas/test/test_2d.state.saverestore.strokeStyle.html
deleted file mode 100644
index 98a1fb657dae..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.strokeStyle.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.strokeStyle</title>
-<!-- Testing: save()/restore() works for strokeStyle -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// 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();
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.transformation.html b/content/canvas/test/test_2d.state.saverestore.transformation.html
deleted file mode 100644
index 6c846222fd3d..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.transformation.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.transformation</title>
-<!-- Testing: save()/restore() affects the current transformation matrix -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.state.saverestore.underflow.html b/content/canvas/test/test_2d.state.saverestore.underflow.html
deleted file mode 100644
index b2772b1212eb..000000000000
--- a/content/canvas/test/test_2d.state.saverestore.underflow.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.state.saverestore.underflow - bug 296821</title>
-<!-- Testing: restore() with an empty stack has no effect -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-for (var i = 0; i < 16; ++i)
-    ctx.restore();
-ctx.lineWidth = 0.5;
-ctx.restore();
-ok(ctx.lineWidth == 0.5, "ctx.lineWidth == 0.5");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.strokeRect.basic.html b/content/canvas/test/test_2d.strokeRect.basic.html
deleted file mode 100644
index 10db8e951df6..000000000000
--- a/content/canvas/test/test_2d.strokeRect.basic.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.strokeRect.basic</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.strokeRect.clip.html b/content/canvas/test/test_2d.strokeRect.clip.html
deleted file mode 100644
index d30301a1eb75..000000000000
--- a/content/canvas/test/test_2d.strokeRect.clip.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.strokeRect.clip</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.beginPath();
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.strokeRect.globalalpha.html b/content/canvas/test/test_2d.strokeRect.globalalpha.html
deleted file mode 100644
index 3775a31a814e..000000000000
--- a/content/canvas/test/test_2d.strokeRect.globalalpha.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.strokeRect.globalalpha</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.strokeRect.globalcomposite.html b/content/canvas/test/test_2d.strokeRect.globalcomposite.html
deleted file mode 100644
index 50411c643a2c..000000000000
--- a/content/canvas/test/test_2d.strokeRect.globalcomposite.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.strokeRect.globalcomposite</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.strokeRect.negative.html b/content/canvas/test/test_2d.strokeRect.negative.html
deleted file mode 100644
index 2367274bdad3..000000000000
--- a/content/canvas/test/test_2d.strokeRect.negative.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.strokeRect.negative</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-ctx.strokeStyle = '#0f0';
-ctx.lineWidth = 25;
-ctx.strokeRect(12, 12, 26, 1);
-ctx.strokeRect(88, 12, -26, 1);
-ctx.strokeRect(12, 38, 26, -1);
-ctx.strokeRect(88, 38, -26, -1);
-isPixel(ctx, 25,12, 0,255,0,255, "25,12", "0,255,0,255", 0);
-isPixel(ctx, 75,12, 0,255,0,255, "75,12", "0,255,0,255", 0);
-isPixel(ctx, 25,37, 0,255,0,255, "25,37", "0,255,0,255", 0);
-isPixel(ctx, 75,37, 0,255,0,255, "75,37", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.strokeRect.nonfinite.html b/content/canvas/test/test_2d.strokeRect.nonfinite.html
deleted file mode 100644
index 89b80dcc2525..000000000000
--- a/content/canvas/test/test_2d.strokeRect.nonfinite.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.strokeRect.nonfinite</title>
-<!-- Testing: strokeRect() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.strokeStyle = '#f00';
-ctx.lineWidth = 150;
-ctx.strokeRect(Infinity, 0, 100, 50);
-ctx.strokeRect(-Infinity, 0, 100, 50);
-ctx.strokeRect(NaN, 0, 100, 50);
-ctx.strokeRect(0, Infinity, 100, 50);
-ctx.strokeRect(0, -Infinity, 100, 50);
-ctx.strokeRect(0, NaN, 100, 50);
-ctx.strokeRect(0, 0, Infinity, 50);
-ctx.strokeRect(0, 0, -Infinity, 50);
-ctx.strokeRect(0, 0, NaN, 50);
-ctx.strokeRect(0, 0, 100, Infinity);
-ctx.strokeRect(0, 0, 100, -Infinity);
-ctx.strokeRect(0, 0, 100, NaN);
-ctx.strokeRect(Infinity, Infinity, 100, 50);
-ctx.strokeRect(Infinity, Infinity, Infinity, 50);
-ctx.strokeRect(Infinity, Infinity, Infinity, Infinity);
-ctx.strokeRect(Infinity, Infinity, 100, Infinity);
-ctx.strokeRect(Infinity, 0, Infinity, 50);
-ctx.strokeRect(Infinity, 0, Infinity, Infinity);
-ctx.strokeRect(Infinity, 0, 100, Infinity);
-ctx.strokeRect(0, Infinity, Infinity, 50);
-ctx.strokeRect(0, Infinity, Infinity, Infinity);
-ctx.strokeRect(0, Infinity, 100, Infinity);
-ctx.strokeRect(0, 0, Infinity, Infinity);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.strokeRect.path.html b/content/canvas/test/test_2d.strokeRect.path.html
deleted file mode 100644
index 891af552fb94..000000000000
--- a/content/canvas/test/test_2d.strokeRect.path.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.strokeRect.path</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.strokeRect.shadow.html b/content/canvas/test/test_2d.strokeRect.shadow.html
deleted file mode 100644
index 809f5792ff77..000000000000
--- a/content/canvas/test/test_2d.strokeRect.shadow.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.strokeRect.shadow</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.fillStyle = '#f00';
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.strokeRect.transform.html b/content/canvas/test/test_2d.strokeRect.transform.html
deleted file mode 100644
index 30d3763b5b8c..000000000000
--- a/content/canvas/test/test_2d.strokeRect.transform.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.strokeRect.transform</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.strokeRect.zero.1.html b/content/canvas/test/test_2d.strokeRect.zero.1.html
deleted file mode 100644
index 3ae46b3d61f8..000000000000
--- a/content/canvas/test/test_2d.strokeRect.zero.1.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.strokeRect.zero.1</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.strokeRect.zero.2.html b/content/canvas/test/test_2d.strokeRect.zero.2.html
deleted file mode 100644
index 355aef2d69a2..000000000000
--- a/content/canvas/test/test_2d.strokeRect.zero.2.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.strokeRect.zero.2</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.strokeRect.zero.3.html b/content/canvas/test/test_2d.strokeRect.zero.3.html
deleted file mode 100644
index e914fda2caf4..000000000000
--- a/content/canvas/test/test_2d.strokeRect.zero.3.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.strokeRect.zero.3</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.strokeRect.zero.4.html b/content/canvas/test/test_2d.strokeRect.zero.4.html
deleted file mode 100644
index 403244914e6b..000000000000
--- a/content/canvas/test/test_2d.strokeRect.zero.4.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.strokeRect.zero.4</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.strokeStyle.default.html b/content/canvas/test/test_2d.strokeStyle.default.html
deleted file mode 100644
index af9f3e196a19..000000000000
--- a/content/canvas/test/test_2d.strokeStyle.default.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.strokeStyle.default</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(ctx.strokeStyle == '#000000', "ctx.strokeStyle == '#000000'");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.order.html b/content/canvas/test/test_2d.transformation.order.html
deleted file mode 100644
index 3bfb33965a3e..000000000000
--- a/content/canvas/test/test_2d.transformation.order.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.order</title>
-<!-- Testing: Transformations are applied in the right order -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.scale(2, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.rotate.direction.html b/content/canvas/test/test_2d.transformation.rotate.direction.html
deleted file mode 100644
index 4cc4aef3de4f..000000000000
--- a/content/canvas/test/test_2d.transformation.rotate.direction.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.rotate.direction</title>
-<!-- Testing: rotate() is clockwise -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.rotate.nonfinite.html b/content/canvas/test/test_2d.transformation.rotate.nonfinite.html
deleted file mode 100644
index 8d6ba038d5d6..000000000000
--- a/content/canvas/test/test_2d.transformation.rotate.nonfinite.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.rotate.nonfinite</title>
-<!-- Testing: rotate() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.translate(100, 10);
-ctx.rotate(Infinity);
-ctx.rotate(-Infinity);
-ctx.rotate(NaN);
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(-100, -10, 100, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.rotate.radians.html b/content/canvas/test/test_2d.transformation.rotate.radians.html
deleted file mode 100644
index a99f1df297bb..000000000000
--- a/content/canvas/test/test_2d.transformation.rotate.radians.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.rotate.radians</title>
-<!-- Testing: rotate() uses radians -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.rotate(Math.PI); // should fail obviously if this is 3.1 degrees
-ctx.fillStyle = '#0f0';
-ctx.fillRect(-100, -50, 100, 50);
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.rotate.wrap.html b/content/canvas/test/test_2d.transformation.rotate.wrap.html
deleted file mode 100644
index 4eaa0a785384..000000000000
--- a/content/canvas/test/test_2d.transformation.rotate.wrap.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.rotate.wrap</title>
-<!-- Testing: rotate() wraps large positive values correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.rotate.wrapnegative.html b/content/canvas/test/test_2d.transformation.rotate.wrapnegative.html
deleted file mode 100644
index 087bd3fbf381..000000000000
--- a/content/canvas/test/test_2d.transformation.rotate.wrapnegative.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.rotate.wrapnegative</title>
-<!-- Testing: rotate() wraps large negative values correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.rotate.zero.html b/content/canvas/test/test_2d.transformation.rotate.zero.html
deleted file mode 100644
index 6facf37de8d3..000000000000
--- a/content/canvas/test/test_2d.transformation.rotate.zero.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.rotate.zero</title>
-<!-- Testing: rotate() by 0 does nothing -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.scale.basic.html b/content/canvas/test/test_2d.transformation.scale.basic.html
deleted file mode 100644
index 7c58f34211a4..000000000000
--- a/content/canvas/test/test_2d.transformation.scale.basic.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.scale.basic</title>
-<!-- Testing: scale() works -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.scale(2, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.scale.large.html b/content/canvas/test/test_2d.transformation.scale.large.html
deleted file mode 100644
index 18a86e08d609..000000000000
--- a/content/canvas/test/test_2d.transformation.scale.large.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.scale.large</title>
-<!-- Testing: scale() with large scale factors works -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.scale(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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.scale.multiple.html b/content/canvas/test/test_2d.transformation.scale.multiple.html
deleted file mode 100644
index 501530751d39..000000000000
--- a/content/canvas/test/test_2d.transformation.scale.multiple.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.scale.multiple</title>
-<!-- Testing: Multiple scale()s combine -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.scale(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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.scale.negative.html b/content/canvas/test/test_2d.transformation.scale.negative.html
deleted file mode 100644
index d4b8ebe0c129..000000000000
--- a/content/canvas/test/test_2d.transformation.scale.negative.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.scale.negative</title>
-<!-- Testing: scale() with negative scale factors works -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.save();
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.scale.nonfinite.html b/content/canvas/test/test_2d.transformation.scale.nonfinite.html
deleted file mode 100644
index 53818d03a1ab..000000000000
--- a/content/canvas/test/test_2d.transformation.scale.nonfinite.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.scale.nonfinite</title>
-<!-- Testing: scale() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.translate(100, 10);
-ctx.scale(Infinity, 0.1);
-ctx.scale(-Infinity, 0.1);
-ctx.scale(NaN, 0.1);
-ctx.scale(0.1, Infinity);
-ctx.scale(0.1, -Infinity);
-ctx.scale(0.1, NaN);
-ctx.scale(Infinity, Infinity);
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(-100, -10, 100, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.scale.zero.html b/content/canvas/test/test_2d.transformation.scale.zero.html
deleted file mode 100644
index 746f8a198e32..000000000000
--- a/content/canvas/test/test_2d.transformation.scale.zero.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.scale.zero</title>
-<!-- Testing: scale() with a scale factor of zero works -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.setTransform.multiple.html b/content/canvas/test/test_2d.transformation.setTransform.multiple.html
deleted file mode 100644
index 9f5619088e5e..000000000000
--- a/content/canvas/test/test_2d.transformation.setTransform.multiple.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.setTransform.multiple</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.setTransform.nonfinite.html b/content/canvas/test/test_2d.transformation.setTransform.nonfinite.html
deleted file mode 100644
index 353ff1f8b1f5..000000000000
--- a/content/canvas/test/test_2d.transformation.setTransform.nonfinite.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.setTransform.nonfinite</title>
-<!-- Testing: setTransform() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.translate(100, 10);
-ctx.setTransform(Infinity, 0, 0, 0, 0, 0);
-ctx.setTransform(-Infinity, 0, 0, 0, 0, 0);
-ctx.setTransform(NaN, 0, 0, 0, 0, 0);
-ctx.setTransform(0, Infinity, 0, 0, 0, 0);
-ctx.setTransform(0, -Infinity, 0, 0, 0, 0);
-ctx.setTransform(0, NaN, 0, 0, 0, 0);
-ctx.setTransform(0, 0, Infinity, 0, 0, 0);
-ctx.setTransform(0, 0, -Infinity, 0, 0, 0);
-ctx.setTransform(0, 0, NaN, 0, 0, 0);
-ctx.setTransform(0, 0, 0, Infinity, 0, 0);
-ctx.setTransform(0, 0, 0, -Infinity, 0, 0);
-ctx.setTransform(0, 0, 0, NaN, 0, 0);
-ctx.setTransform(0, 0, 0, 0, Infinity, 0);
-ctx.setTransform(0, 0, 0, 0, -Infinity, 0);
-ctx.setTransform(0, 0, 0, 0, NaN, 0);
-ctx.setTransform(0, 0, 0, 0, 0, Infinity);
-ctx.setTransform(0, 0, 0, 0, 0, -Infinity);
-ctx.setTransform(0, 0, 0, 0, 0, NaN);
-ctx.setTransform(Infinity, Infinity, 0, 0, 0, 0);
-ctx.setTransform(Infinity, Infinity, Infinity, 0, 0, 0);
-ctx.setTransform(Infinity, Infinity, Infinity, Infinity, 0, 0);
-ctx.setTransform(Infinity, Infinity, Infinity, Infinity, Infinity, 0);
-ctx.setTransform(Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.setTransform(Infinity, Infinity, Infinity, Infinity, 0, Infinity);
-ctx.setTransform(Infinity, Infinity, Infinity, 0, Infinity, 0);
-ctx.setTransform(Infinity, Infinity, Infinity, 0, Infinity, Infinity);
-ctx.setTransform(Infinity, Infinity, Infinity, 0, 0, Infinity);
-ctx.setTransform(Infinity, Infinity, 0, Infinity, 0, 0);
-ctx.setTransform(Infinity, Infinity, 0, Infinity, Infinity, 0);
-ctx.setTransform(Infinity, Infinity, 0, Infinity, Infinity, Infinity);
-ctx.setTransform(Infinity, Infinity, 0, Infinity, 0, Infinity);
-ctx.setTransform(Infinity, Infinity, 0, 0, Infinity, 0);
-ctx.setTransform(Infinity, Infinity, 0, 0, Infinity, Infinity);
-ctx.setTransform(Infinity, Infinity, 0, 0, 0, Infinity);
-ctx.setTransform(Infinity, 0, Infinity, 0, 0, 0);
-ctx.setTransform(Infinity, 0, Infinity, Infinity, 0, 0);
-ctx.setTransform(Infinity, 0, Infinity, Infinity, Infinity, 0);
-ctx.setTransform(Infinity, 0, Infinity, Infinity, Infinity, Infinity);
-ctx.setTransform(Infinity, 0, Infinity, Infinity, 0, Infinity);
-ctx.setTransform(Infinity, 0, Infinity, 0, Infinity, 0);
-ctx.setTransform(Infinity, 0, Infinity, 0, Infinity, Infinity);
-ctx.setTransform(Infinity, 0, Infinity, 0, 0, Infinity);
-ctx.setTransform(Infinity, 0, 0, Infinity, 0, 0);
-ctx.setTransform(Infinity, 0, 0, Infinity, Infinity, 0);
-ctx.setTransform(Infinity, 0, 0, Infinity, Infinity, Infinity);
-ctx.setTransform(Infinity, 0, 0, Infinity, 0, Infinity);
-ctx.setTransform(Infinity, 0, 0, 0, Infinity, 0);
-ctx.setTransform(Infinity, 0, 0, 0, Infinity, Infinity);
-ctx.setTransform(Infinity, 0, 0, 0, 0, Infinity);
-ctx.setTransform(0, Infinity, Infinity, 0, 0, 0);
-ctx.setTransform(0, Infinity, Infinity, Infinity, 0, 0);
-ctx.setTransform(0, Infinity, Infinity, Infinity, Infinity, 0);
-ctx.setTransform(0, Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.setTransform(0, Infinity, Infinity, Infinity, 0, Infinity);
-ctx.setTransform(0, Infinity, Infinity, 0, Infinity, 0);
-ctx.setTransform(0, Infinity, Infinity, 0, Infinity, Infinity);
-ctx.setTransform(0, Infinity, Infinity, 0, 0, Infinity);
-ctx.setTransform(0, Infinity, 0, Infinity, 0, 0);
-ctx.setTransform(0, Infinity, 0, Infinity, Infinity, 0);
-ctx.setTransform(0, Infinity, 0, Infinity, Infinity, Infinity);
-ctx.setTransform(0, Infinity, 0, Infinity, 0, Infinity);
-ctx.setTransform(0, Infinity, 0, 0, Infinity, 0);
-ctx.setTransform(0, Infinity, 0, 0, Infinity, Infinity);
-ctx.setTransform(0, Infinity, 0, 0, 0, Infinity);
-ctx.setTransform(0, 0, Infinity, Infinity, 0, 0);
-ctx.setTransform(0, 0, Infinity, Infinity, Infinity, 0);
-ctx.setTransform(0, 0, Infinity, Infinity, Infinity, Infinity);
-ctx.setTransform(0, 0, Infinity, Infinity, 0, Infinity);
-ctx.setTransform(0, 0, Infinity, 0, Infinity, 0);
-ctx.setTransform(0, 0, Infinity, 0, Infinity, Infinity);
-ctx.setTransform(0, 0, Infinity, 0, 0, Infinity);
-ctx.setTransform(0, 0, 0, Infinity, Infinity, 0);
-ctx.setTransform(0, 0, 0, Infinity, Infinity, Infinity);
-ctx.setTransform(0, 0, 0, Infinity, 0, Infinity);
-ctx.setTransform(0, 0, 0, 0, Infinity, Infinity);
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(-100, -10, 100, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.setTransform.skewed.html b/content/canvas/test/test_2d.transformation.setTransform.skewed.html
deleted file mode 100644
index a0b847e03a06..000000000000
--- a/content/canvas/test/test_2d.transformation.setTransform.skewed.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.setTransform.skewed</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.transform.identity.html b/content/canvas/test/test_2d.transformation.transform.identity.html
deleted file mode 100644
index ca0317af410b..000000000000
--- a/content/canvas/test/test_2d.transformation.transform.identity.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.transform.identity</title>
-<!-- Testing: transform() with the identity matrix does nothing -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.transform.multiply.html b/content/canvas/test/test_2d.transformation.transform.multiply.html
deleted file mode 100644
index ca7ebd7efe5f..000000000000
--- a/content/canvas/test/test_2d.transformation.transform.multiply.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.transform.multiply</title>
-<!-- Testing: transform() multiplies the CTM -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.transform.nonfinite.html b/content/canvas/test/test_2d.transformation.transform.nonfinite.html
deleted file mode 100644
index 13e76480404d..000000000000
--- a/content/canvas/test/test_2d.transformation.transform.nonfinite.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.transform.nonfinite</title>
-<!-- Testing: transform() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.translate(100, 10);
-ctx.transform(Infinity, 0, 0, 0, 0, 0);
-ctx.transform(-Infinity, 0, 0, 0, 0, 0);
-ctx.transform(NaN, 0, 0, 0, 0, 0);
-ctx.transform(0, Infinity, 0, 0, 0, 0);
-ctx.transform(0, -Infinity, 0, 0, 0, 0);
-ctx.transform(0, NaN, 0, 0, 0, 0);
-ctx.transform(0, 0, Infinity, 0, 0, 0);
-ctx.transform(0, 0, -Infinity, 0, 0, 0);
-ctx.transform(0, 0, NaN, 0, 0, 0);
-ctx.transform(0, 0, 0, Infinity, 0, 0);
-ctx.transform(0, 0, 0, -Infinity, 0, 0);
-ctx.transform(0, 0, 0, NaN, 0, 0);
-ctx.transform(0, 0, 0, 0, Infinity, 0);
-ctx.transform(0, 0, 0, 0, -Infinity, 0);
-ctx.transform(0, 0, 0, 0, NaN, 0);
-ctx.transform(0, 0, 0, 0, 0, Infinity);
-ctx.transform(0, 0, 0, 0, 0, -Infinity);
-ctx.transform(0, 0, 0, 0, 0, NaN);
-ctx.transform(Infinity, Infinity, 0, 0, 0, 0);
-ctx.transform(Infinity, Infinity, Infinity, 0, 0, 0);
-ctx.transform(Infinity, Infinity, Infinity, Infinity, 0, 0);
-ctx.transform(Infinity, Infinity, Infinity, Infinity, Infinity, 0);
-ctx.transform(Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.transform(Infinity, Infinity, Infinity, Infinity, 0, Infinity);
-ctx.transform(Infinity, Infinity, Infinity, 0, Infinity, 0);
-ctx.transform(Infinity, Infinity, Infinity, 0, Infinity, Infinity);
-ctx.transform(Infinity, Infinity, Infinity, 0, 0, Infinity);
-ctx.transform(Infinity, Infinity, 0, Infinity, 0, 0);
-ctx.transform(Infinity, Infinity, 0, Infinity, Infinity, 0);
-ctx.transform(Infinity, Infinity, 0, Infinity, Infinity, Infinity);
-ctx.transform(Infinity, Infinity, 0, Infinity, 0, Infinity);
-ctx.transform(Infinity, Infinity, 0, 0, Infinity, 0);
-ctx.transform(Infinity, Infinity, 0, 0, Infinity, Infinity);
-ctx.transform(Infinity, Infinity, 0, 0, 0, Infinity);
-ctx.transform(Infinity, 0, Infinity, 0, 0, 0);
-ctx.transform(Infinity, 0, Infinity, Infinity, 0, 0);
-ctx.transform(Infinity, 0, Infinity, Infinity, Infinity, 0);
-ctx.transform(Infinity, 0, Infinity, Infinity, Infinity, Infinity);
-ctx.transform(Infinity, 0, Infinity, Infinity, 0, Infinity);
-ctx.transform(Infinity, 0, Infinity, 0, Infinity, 0);
-ctx.transform(Infinity, 0, Infinity, 0, Infinity, Infinity);
-ctx.transform(Infinity, 0, Infinity, 0, 0, Infinity);
-ctx.transform(Infinity, 0, 0, Infinity, 0, 0);
-ctx.transform(Infinity, 0, 0, Infinity, Infinity, 0);
-ctx.transform(Infinity, 0, 0, Infinity, Infinity, Infinity);
-ctx.transform(Infinity, 0, 0, Infinity, 0, Infinity);
-ctx.transform(Infinity, 0, 0, 0, Infinity, 0);
-ctx.transform(Infinity, 0, 0, 0, Infinity, Infinity);
-ctx.transform(Infinity, 0, 0, 0, 0, Infinity);
-ctx.transform(0, Infinity, Infinity, 0, 0, 0);
-ctx.transform(0, Infinity, Infinity, Infinity, 0, 0);
-ctx.transform(0, Infinity, Infinity, Infinity, Infinity, 0);
-ctx.transform(0, Infinity, Infinity, Infinity, Infinity, Infinity);
-ctx.transform(0, Infinity, Infinity, Infinity, 0, Infinity);
-ctx.transform(0, Infinity, Infinity, 0, Infinity, 0);
-ctx.transform(0, Infinity, Infinity, 0, Infinity, Infinity);
-ctx.transform(0, Infinity, Infinity, 0, 0, Infinity);
-ctx.transform(0, Infinity, 0, Infinity, 0, 0);
-ctx.transform(0, Infinity, 0, Infinity, Infinity, 0);
-ctx.transform(0, Infinity, 0, Infinity, Infinity, Infinity);
-ctx.transform(0, Infinity, 0, Infinity, 0, Infinity);
-ctx.transform(0, Infinity, 0, 0, Infinity, 0);
-ctx.transform(0, Infinity, 0, 0, Infinity, Infinity);
-ctx.transform(0, Infinity, 0, 0, 0, Infinity);
-ctx.transform(0, 0, Infinity, Infinity, 0, 0);
-ctx.transform(0, 0, Infinity, Infinity, Infinity, 0);
-ctx.transform(0, 0, Infinity, Infinity, Infinity, Infinity);
-ctx.transform(0, 0, Infinity, Infinity, 0, Infinity);
-ctx.transform(0, 0, Infinity, 0, Infinity, 0);
-ctx.transform(0, 0, Infinity, 0, Infinity, Infinity);
-ctx.transform(0, 0, Infinity, 0, 0, Infinity);
-ctx.transform(0, 0, 0, Infinity, Infinity, 0);
-ctx.transform(0, 0, 0, Infinity, Infinity, Infinity);
-ctx.transform(0, 0, 0, Infinity, 0, Infinity);
-ctx.transform(0, 0, 0, 0, Infinity, Infinity);
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(-100, -10, 100, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.transform.skewed.html b/content/canvas/test/test_2d.transformation.transform.skewed.html
deleted file mode 100644
index 6d0cba011124..000000000000
--- a/content/canvas/test/test_2d.transformation.transform.skewed.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.transform.skewed</title>
-<!-- Testing: transform() with skewy matrix transforms correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-// 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.translate.basic.html b/content/canvas/test/test_2d.transformation.translate.basic.html
deleted file mode 100644
index 9048c5678f85..000000000000
--- a/content/canvas/test/test_2d.transformation.translate.basic.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.translate.basic</title>
-<!-- Testing: translate() works -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.transformation.translate.nonfinite.html b/content/canvas/test/test_2d.transformation.translate.nonfinite.html
deleted file mode 100644
index 17d55f25d996..000000000000
--- a/content/canvas/test/test_2d.transformation.translate.nonfinite.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.transformation.translate.nonfinite</title>
-<!-- Testing: translate() with Infinity/NaN is ignored -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.translate(100, 10);
-ctx.translate(Infinity, 0.1);
-ctx.translate(-Infinity, 0.1);
-ctx.translate(NaN, 0.1);
-ctx.translate(0.1, Infinity);
-ctx.translate(0.1, -Infinity);
-ctx.translate(0.1, NaN);
-ctx.translate(Infinity, Infinity);
-
-ctx.fillStyle = '#0f0';
-ctx.fillRect(-100, -10, 100, 50);
-
-isPixel(ctx, 50,25, 0,255,0,255, "50,25", "0,255,0,255", 0);
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.type.delete.html b/content/canvas/test/test_2d.type.delete.html
deleted file mode 100644
index b9c05233ff1b..000000000000
--- a/content/canvas/test/test_2d.type.delete.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.type.delete</title>
-<!-- Testing: window.CanvasRenderingContext2D is DontDelete -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-delete window.CanvasRenderingContext2D;
-ok(window.CanvasRenderingContext2D !== undefined, "window.CanvasRenderingContext2D !== undefined");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.type.exists.html b/content/canvas/test/test_2d.type.exists.html
deleted file mode 100644
index fb0d8949a730..000000000000
--- a/content/canvas/test/test_2d.type.exists.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.type.exists</title>
-<!-- Testing: The 2D context interface is a property of 'window' -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(window.CanvasRenderingContext2D, "window.CanvasRenderingContext2D");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.type.extend.html b/content/canvas/test/test_2d.type.extend.html
deleted file mode 100644
index 560670952c67..000000000000
--- a/content/canvas/test/test_2d.type.extend.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.type.extend</title>
-<!-- Testing: Interface methods can be added -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.type.prototype.html b/content/canvas/test/test_2d.type.prototype.html
deleted file mode 100644
index 8b2860d8fca7..000000000000
--- a/content/canvas/test/test_2d.type.prototype.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.type.prototype</title>
-<!-- Testing: window.CanvasRenderingContext2D.prototype is { DontDelete, ReadOnly }, and its methods are not -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(window.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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.type.replace.html b/content/canvas/test/test_2d.type.replace.html
deleted file mode 100644
index cc46769d091c..000000000000
--- a/content/canvas/test/test_2d.type.replace.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.type.replace</title>
-<!-- Testing: Interface methods can be overridden -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_2d.voidreturn.html b/content/canvas/test/test_2d.voidreturn.html
deleted file mode 100644
index 75dde13c49aa..000000000000
--- a/content/canvas/test/test_2d.voidreturn.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.voidreturn</title>
-<!-- Testing: void methods return undefined -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(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");
-
-SimpleTest.finish();
-
-});
-</script>
-<img src="image_yellow.png" id="yellow.png" class="resource">
-
diff --git a/content/canvas/test/test_bug397524.html b/content/canvas/test/test_bug397524.html
deleted file mode 100644
index 6faf0593c967..000000000000
--- a/content/canvas/test/test_bug397524.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=397524
--->
-<head>
-  <title>Test for Bug 397524</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=397524">Mozilla Bug 397524</a>
-<p id="display">
-  <canvas id="c1" width="1" height="1"></canvas>
-  <canvas id="c2" width="1" height="1"></canvas>
-  <canvas id="c3" width="1" height="1"></canvas>
-  <img id="i1", src="image_green-1x1.png">
-  <img id="i2" src="http://example.com/tests/content/canvas/test/image_green-1x1.png">
-  <img id="i3" src="image_green-redirect">
-</p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 397524 **/
-
-SimpleTest.waitForExplicitFinish();
-
-function draw(n) {
-  $("c" + n).getContext('2d').drawImage($("i" + n), 0, 0);
-}
-
-addLoadEvent(function() {
-  draw(1);
-  draw(2);
-  draw(3);
-
-  // Should be able to get the data out of the first canvas
-  $("c1").toDataURL("image/png");
-
-  // Should not be able to get the data out of a cross-site load
-  var gotData = false;  
-  try {
-    $("c2").toDataURL("image/png");
-    gotData = true;
-  } catch (ex if (ex.code == 1000 && ex.name == "NS_ERROR_DOM_SECURITY_ERR")) {
-  }
-  is(gotData, false, "Shouldn't be able to read images cross-site!");
-
-  // Should not be able to get the data out of a redirected cross-site load
-  var gotData = false;  
-  try {
-    $("c3").toDataURL("image/png");
-    gotData = true;
-  } catch (ex if (ex.code == 1000 && ex.name == "NS_ERROR_DOM_SECURITY_ERR")) {
-  }
-  is(gotData, false, "Shouldn't be able to read images redirected cross-site!");
-
-  SimpleTest.finish();
-});
-
-
-
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/content/canvas/test/test_bug405982.html b/content/canvas/test/test_bug405982.html
deleted file mode 100644
index aad0759d655a..000000000000
--- a/content/canvas/test/test_bug405982.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: toDataURL.png</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
-try {
-  var data = canvas.toDataURL('image/png', 'quality=100');
-  ok(false, "Should have thrown an exception for invalid args to png encoder");
-}
-catch (e) {
-  is(e.result, Components.results.NS_ERROR_INVALID_ARG, "Exception was wrong for png encoder");
-}
-
-try {
-  var data = canvas.toDataURL('image/jpeg', 'foobar=true');
-  ok(false, "Should have thrown an exception for invalid args to jpeg encoder");
-}
-catch (e) {
-  is(e.result, Components.results.NS_ERROR_INVALID_ARG, "Exception was wrong for jpeg encoder");
-}
-
-SimpleTest.finish();
-});
-</script>
diff --git a/content/canvas/test/test_context.arguments.extra.html b/content/canvas/test/test_context.arguments.extra.html
deleted file mode 100644
index 561cfa4c9488..000000000000
--- a/content/canvas/test/test_context.arguments.extra.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: context.arguments.extra</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(canvas.getContext('2d', 'foo') !== null, "canvas.getContext('2d', 'foo') !== null");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_context.arguments.missing.html b/content/canvas/test/test_context.arguments.missing.html
deleted file mode 100644
index d9f3e87310f5..000000000000
--- a/content/canvas/test/test_context.arguments.missing.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: context.arguments.missing</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown = undefined; try {
-  canvas.getContext();
-} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_context.casesensitive.html b/content/canvas/test/test_context.casesensitive.html
deleted file mode 100644
index fb54425d0e67..000000000000
--- a/content/canvas/test/test_context.casesensitive.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: context.casesensitive - bug 401788</title>
-<!-- Testing: Context name "2D" is unrecognised; matching is case sensitive -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ok(canvas.getContext('2D') === null, "canvas.getContext('2D') === null");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_context.emptystring.html b/content/canvas/test/test_context.emptystring.html
deleted file mode 100644
index 0a5ac8690163..000000000000
--- a/content/canvas/test/test_context.emptystring.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: context.emptystring - bug 401788</title>
-<!-- Testing: getContext with empty string returns null -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ok(canvas.getContext("") === null, "canvas.getContext(\"\") === null");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_context.unrecognised.badname.html b/content/canvas/test/test_context.unrecognised.badname.html
deleted file mode 100644
index 9ff0fd061355..000000000000
--- a/content/canvas/test/test_context.unrecognised.badname.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: context.unrecognised.badname - bug 401788</title>
-<!-- Testing: getContext with unrecognised context name returns null -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ok(canvas.getContext('This is not an implemented context in any real browser') === null, "canvas.getContext('This is not an implemented context in any real browser') === null");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_context.unrecognised.badsuffix.html b/content/canvas/test/test_context.unrecognised.badsuffix.html
deleted file mode 100644
index 29d323d1adf8..000000000000
--- a/content/canvas/test/test_context.unrecognised.badsuffix.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: context.unrecognised.badsuffix - bug 401788</title>
-<!-- Testing: Context name "2d" plus a suffix is unrecognised -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ok(canvas.getContext("2d#") === null, "canvas.getContext(\"2d#\") === null");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_context.unrecognised.nullsuffix.html b/content/canvas/test/test_context.unrecognised.nullsuffix.html
deleted file mode 100644
index 1718a7cb2d0a..000000000000
--- a/content/canvas/test/test_context.unrecognised.nullsuffix.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: context.unrecognised.nullsuffix - bug 401788</title>
-<!-- Testing: Context name "2d" plus a "\0" suffix is unrecognised -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ok(canvas.getContext("2d\0") === null, "canvas.getContext(\"2d\\0\") === null");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_context.unrecognised.unicode.html b/content/canvas/test/test_context.unrecognised.unicode.html
deleted file mode 100644
index 0a3e4a9160ac..000000000000
--- a/content/canvas/test/test_context.unrecognised.unicode.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: context.unrecognised.unicode - bug 401788</title>
-<!-- Testing: Context name which kind of looks like "2d" is unrecognised -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-ok(canvas.getContext("2\uFF44") === null, "canvas.getContext(\"2\\uFF44\") === null"); // Fullwidth Latin Small Letter D
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_fallback.basic.html b/content/canvas/test/test_fallback.basic.html
deleted file mode 100644
index 263d8fd92ad6..000000000000
--- a/content/canvas/test/test_fallback.basic.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: fallback.basic</title>
-<!-- Testing: Fallback content is inserted into the DOM -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(canvas.childNodes.length == 1, "canvas.childNodes.length == 1");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_fallback.multiple.html b/content/canvas/test/test_fallback.multiple.html
deleted file mode 100644
index 320cf9360595..000000000000
--- a/content/canvas/test/test_fallback.multiple.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: fallback.multiple</title>
-<!-- Testing: Fallback content with multiple elements -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL</p><p class="fallback">FAIL</p></canvas>
-<script>
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_fallback.nested.html b/content/canvas/test/test_fallback.nested.html
deleted file mode 100644
index 3eb48b457003..000000000000
--- a/content/canvas/test/test_fallback.nested.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: fallback.nested</title>
-<!-- Testing: Fallback content containing another canvas (mostly testing parsers) -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><canvas><p class="fallback">FAIL (fallback content)</p></canvas><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(canvas.childNodes.length == 2, "canvas.childNodes.length == 2");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_initial.colour.html b/content/canvas/test/test_initial.colour.html
deleted file mode 100644
index e11c16d6c153..000000000000
--- a/content/canvas/test/test_initial.colour.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: initial.colour</title>
-<!-- Testing: Initial state is transparent black -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-isPixel(ctx, 20,20, 0,0,0,0, "20,20", "0,0,0,0", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_initial.reset.2dstate.html b/content/canvas/test/test_initial.reset.2dstate.html
deleted file mode 100644
index 700eaae329b4..000000000000
--- a/content/canvas/test/test_initial.reset.2dstate.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: initial.reset.2dstate</title>
-<!-- Testing: Resetting the canvas state resets 2D state variables -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_initial.reset.clip.html b/content/canvas/test/test_initial.reset.clip.html
deleted file mode 100644
index 0d34bc969e00..000000000000
--- a/content/canvas/test/test_initial.reset.clip.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: initial.reset.clip</title>
-<!-- Testing: Resetting the canvas state resets the current clip region -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_initial.reset.different.html b/content/canvas/test/test_initial.reset.different.html
deleted file mode 100644
index 3aa980ce37e2..000000000000
--- a/content/canvas/test/test_initial.reset.different.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: initial.reset.different</title>
-<!-- Testing: Changing size resets canvas to transparent black -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_initial.reset.gradient.html b/content/canvas/test/test_initial.reset.gradient.html
deleted file mode 100644
index 723f2a047e1d..000000000000
--- a/content/canvas/test/test_initial.reset.gradient.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: initial.reset.gradient</title>
-<!-- Testing: Resetting the canvas state does not invalidate any existing gradients -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_initial.reset.path.html b/content/canvas/test/test_initial.reset.path.html
deleted file mode 100644
index ba5d937621df..000000000000
--- a/content/canvas/test/test_initial.reset.path.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: initial.reset.path</title>
-<!-- Testing: Resetting the canvas state resets the current path -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_initial.reset.pattern.html b/content/canvas/test/test_initial.reset.pattern.html
deleted file mode 100644
index 6f3832b680ae..000000000000
--- a/content/canvas/test/test_initial.reset.pattern.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: initial.reset.pattern</title>
-<!-- Testing: Resetting the canvas state does not invalidate any existing patterns -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_initial.reset.same.html b/content/canvas/test/test_initial.reset.same.html
deleted file mode 100644
index 02d4128cbf0c..000000000000
--- a/content/canvas/test/test_initial.reset.same.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: initial.reset.same</title>
-<!-- Testing: Setting size (not changing the value) resets canvas to transparent black -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_initial.reset.transform.html b/content/canvas/test/test_initial.reset.transform.html
deleted file mode 100644
index 3179333ce4a4..000000000000
--- a/content/canvas/test/test_initial.reset.transform.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: initial.reset.transform</title>
-<!-- Testing: Resetting the canvas state resets the current transformation matrix -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-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);
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.default.html b/content/canvas/test/test_size.attributes.default.html
deleted file mode 100644
index 0ebda96eaf21..000000000000
--- a/content/canvas/test/test_size.attributes.default.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.default</title>
-<!-- Testing: Default width/height -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" ><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(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')");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.html b/content/canvas/test/test_size.attributes.html
deleted file mode 100644
index e2e143edfd4f..000000000000
--- a/content/canvas/test/test_size.attributes.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes</title>
-<!-- Testing: width/height DOM attributes and content attributes -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="120" height="60"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.parse.badsuffix.html b/content/canvas/test/test_size.attributes.parse.badsuffix.html
deleted file mode 100644
index 788046cb0122..000000000000
--- a/content/canvas/test/test_size.attributes.parse.badsuffix.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.parse.badsuffix</title>
-<!-- Testing: Parsing of non-negative integers -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100foo" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-todo(canvas.width == 100, "canvas.width == 100");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.parse.floatsuffix.html b/content/canvas/test/test_size.attributes.parse.floatsuffix.html
deleted file mode 100644
index cba2e33ac840..000000000000
--- a/content/canvas/test/test_size.attributes.parse.floatsuffix.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.parse.floatsuffix</title>
-<!-- Testing: Parsing of non-negative integers -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100.9" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(canvas.width == 100, "canvas.width == 100");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.parse.negative.html b/content/canvas/test/test_size.attributes.parse.negative.html
deleted file mode 100644
index 68184cdcc4c2..000000000000
--- a/content/canvas/test/test_size.attributes.parse.negative.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.parse.negative</title>
-<!-- Testing: Parsing of non-negative integers -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="-100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-todo(canvas.width == 300, "canvas.width == 300");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.parse.nonnumber.html b/content/canvas/test/test_size.attributes.parse.nonnumber.html
deleted file mode 100644
index 1dc9de84dcea..000000000000
--- a/content/canvas/test/test_size.attributes.parse.nonnumber.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.parse.nonnumber</title>
-<!-- Testing: Parsing of non-negative integers -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="foo" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(canvas.width == 300, "canvas.width == 300");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.parse.percentsuffix.html b/content/canvas/test/test_size.attributes.parse.percentsuffix.html
deleted file mode 100644
index 6167c0f9c021..000000000000
--- a/content/canvas/test/test_size.attributes.parse.percentsuffix.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.parse.percentsuffix</title>
-<!-- Testing: Parsing of non-negative integers -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100%" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(canvas.width == 100, "canvas.width == 100");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.parse.whitespace.html b/content/canvas/test/test_size.attributes.parse.whitespace.html
deleted file mode 100644
index e4c15cefa387..000000000000
--- a/content/canvas/test/test_size.attributes.parse.whitespace.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.parse.whitespace</title>
-<!-- Testing: Parsing of non-negative integers -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="   100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(canvas.width == 100, "canvas.width == 100");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.parse.zero.html b/content/canvas/test/test_size.attributes.parse.zero.html
deleted file mode 100644
index 1fc43007bfa3..000000000000
--- a/content/canvas/test/test_size.attributes.parse.zero.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.parse.zero</title>
-<!-- Testing: Parsing of non-negative integers -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="0" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(canvas.width == 0, "canvas.width == 0");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.parse.zerosuffix.html b/content/canvas/test/test_size.attributes.parse.zerosuffix.html
deleted file mode 100644
index c5883229a77b..000000000000
--- a/content/canvas/test/test_size.attributes.parse.zerosuffix.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.parse.zerosuffix</title>
-<!-- Testing: Parsing of non-negative integers -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100.0" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(canvas.width == 100, "canvas.width == 100");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.reflect.1.html b/content/canvas/test/test_size.attributes.reflect.1.html
deleted file mode 100644
index c3f70256fd5f..000000000000
--- a/content/canvas/test/test_size.attributes.reflect.1.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.reflect.1</title>
-<!-- Testing: Setting DOM attributes updates DOM and content attributes -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.reflect.2.html b/content/canvas/test/test_size.attributes.reflect.2.html
deleted file mode 100644
index 1dc08db83db1..000000000000
--- a/content/canvas/test/test_size.attributes.reflect.2.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.reflect.2</title>
-<!-- Testing: Setting content attributes updates DOM and content attributes -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.removed.html b/content/canvas/test/test_size.attributes.removed.html
deleted file mode 100644
index 8898fca36606..000000000000
--- a/content/canvas/test/test_size.attributes.removed.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.removed</title>
-<!-- Testing: Removing content attributes reverts to default size -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="120" height="60"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.setAttribute.badsuffix.html b/content/canvas/test/test_size.attributes.setAttribute.badsuffix.html
deleted file mode 100644
index f469a1f06c9f..000000000000
--- a/content/canvas/test/test_size.attributes.setAttribute.badsuffix.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.setAttribute.badsuffix</title>
-<!-- Testing: Parsing of non-negative integers in setAttribute -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.setAttribute.floatsuffix.html b/content/canvas/test/test_size.attributes.setAttribute.floatsuffix.html
deleted file mode 100644
index c868392bd073..000000000000
--- a/content/canvas/test/test_size.attributes.setAttribute.floatsuffix.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.setAttribute.floatsuffix</title>
-<!-- Testing: Parsing of non-negative integers in setAttribute -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.setAttribute.negative.html b/content/canvas/test/test_size.attributes.setAttribute.negative.html
deleted file mode 100644
index 973aca93fc44..000000000000
--- a/content/canvas/test/test_size.attributes.setAttribute.negative.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.setAttribute.negative</title>
-<!-- Testing: Parsing of non-negative integers in setAttribute -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.setAttribute.nonnumber.html b/content/canvas/test/test_size.attributes.setAttribute.nonnumber.html
deleted file mode 100644
index 79a6ff9e9042..000000000000
--- a/content/canvas/test/test_size.attributes.setAttribute.nonnumber.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.setAttribute.nonnumber</title>
-<!-- Testing: Parsing of non-negative integers in setAttribute -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.setAttribute.percentsuffix.html b/content/canvas/test/test_size.attributes.setAttribute.percentsuffix.html
deleted file mode 100644
index 9f6f73956534..000000000000
--- a/content/canvas/test/test_size.attributes.setAttribute.percentsuffix.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.setAttribute.percentsuffix</title>
-<!-- Testing: Parsing of non-negative integers in setAttribute -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.setAttribute.whitespace.html b/content/canvas/test/test_size.attributes.setAttribute.whitespace.html
deleted file mode 100644
index 325640a0dc32..000000000000
--- a/content/canvas/test/test_size.attributes.setAttribute.whitespace.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.setAttribute.whitespace</title>
-<!-- Testing: Parsing of non-negative integers in setAttribute -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.setAttribute.zero.html b/content/canvas/test/test_size.attributes.setAttribute.zero.html
deleted file mode 100644
index f70490748b55..000000000000
--- a/content/canvas/test/test_size.attributes.setAttribute.zero.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.setAttribute.zero</title>
-<!-- Testing: Parsing of non-negative integers in setAttribute -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.setAttribute.zerosuffix.html b/content/canvas/test/test_size.attributes.setAttribute.zerosuffix.html
deleted file mode 100644
index 474fec49c380..000000000000
--- a/content/canvas/test/test_size.attributes.setAttribute.zerosuffix.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.setAttribute.zerosuffix</title>
-<!-- Testing: Parsing of non-negative integers in setAttribute -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.style.html b/content/canvas/test/test_size.attributes.style.html
deleted file mode 100644
index be00e3ccec8c..000000000000
--- a/content/canvas/test/test_size.attributes.style.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.style</title>
-<!-- Testing: Canvas size is independent of CSS resizing -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="50" height="30" style="width: 100px; height: 50px"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.type.get.html b/content/canvas/test/test_size.attributes.type.get.html
deleted file mode 100644
index f268961cd1a8..000000000000
--- a/content/canvas/test/test_size.attributes.type.get.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.type.get</title>
-<!-- Testing: width/height DOM/content attributes - string vs number types -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="120" height="60"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-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'");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_size.attributes.type.set.html b/content/canvas/test/test_size.attributes.type.set.html
deleted file mode 100644
index 2bc4f5da7764..000000000000
--- a/content/canvas/test/test_size.attributes.type.set.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: size.attributes.type.set</title>
-<!-- Testing: Setting width/height DOM attributes -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-canvas.width = 120;
-canvas.height = 60;
-ok(canvas.width === 120, "canvas.width === 120");
-ok(canvas.height === 60, "canvas.height === 60");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_text.font.html b/content/canvas/test/test_text.font.html
deleted file mode 100644
index 93fe24c63234..000000000000
--- a/content/canvas/test/test_text.font.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: text.font</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/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');
-
-is(ctx.font, '10px sans-serif', "default font is not '10px sans-serif'");
-
-ctx.save();
-ctx.font = '20pt serif';
-is(ctx.font, '20pt serif', 'font getter returns incorrect value');
-
-ctx.restore();
-is(ctx.font, '10px sans-serif', 'font not being stored in the context state');
-
-if (!_deferred) SimpleTest.finish();
-});
-</script>
-
diff --git a/content/canvas/test/test_text.measure.html b/content/canvas/test/test_text.measure.html
deleted file mode 100644
index 767cb0936721..000000000000
--- a/content/canvas/test/test_text.measure.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: text.measure</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/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.font = "10px sans-serif";
-ctx.textAlign = "left";
-ctx.textBaseline = "top";
-
-var str = 'Test String';
-var wid = ctx.measureText(str).width;
-
-ok(wid > 0, "measureText returns nonpositive value for non-empty string");
-
-ctx.font = "20px sans-serif";
-isnot(wid, ctx.measureText(str).width, "measureText does not change with a different font size");
-
-ctx.font = "10px sans-serif";
-ctx.textAlign = "center";
-ctx.textBaseline = "alphabetic";
-
-is(wid, ctx.measureText(str).width, "measureText changes when alignement/baseline is changed");
-
-
-if (!_deferred) SimpleTest.finish();
-});
-</script>
-
diff --git a/content/canvas/test/test_text.space.replace.html b/content/canvas/test/test_text.space.replace.html
deleted file mode 100644
index 48daf8d59968..000000000000
--- a/content/canvas/test/test_text.space.replace.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: text.space.replace</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/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 swid = ctx.measureText(' ').width;
-ctx.font = "10px sans-serif";
-
-isnot(swid, 0.0, "measureText reutuns zero for a non-empty string");
-is(swid, ctx.measureText('\x09').width, "measureText does not replace whitespace char with a space");
-is(swid, ctx.measureText('\x0A').width, "measureText does not replace whitespace char with a space");
-is(swid, ctx.measureText('\x0B').width, "measureText does not replace whitespace char with a space");
-is(swid, ctx.measureText('\x0C').width, "measureText does not replace whitespace char with a space");
-is(swid, ctx.measureText('\x0D').width, "measureText does not replace whitespace char with a space");
-
-if (!_deferred) SimpleTest.finish();
-});
-</script>
-
diff --git a/content/canvas/test/test_text.textAlign.html b/content/canvas/test/test_text.textAlign.html
deleted file mode 100644
index 0538de74634e..000000000000
--- a/content/canvas/test/test_text.textAlign.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: text.textAlign</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/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');
-
-is(ctx.textAlign, 'start', "default textAlign is not 'start'");
-
-ctx.save();
-ctx.textAlign = 'end';
-is(ctx.textAlign, 'end', 'textAlign getter returns incorrect value');
-
-ctx.save();
-ctx.textAlign = 'left';
-is(ctx.textAlign, 'left', 'textAlign getter returns incorrect value');
-
-ctx.save();
-ctx.textAlign = 'center';
-is(ctx.textAlign, 'center', 'textAlign getter returns incorrect value');
-
-ctx.save();
-ctx.textAlign = 'right';
-is(ctx.textAlign, 'right', 'textAlign getter returns incorrect value');
-
-ctx.save();
-ctx.textAlign = 'start';
-is(ctx.textAlign, 'start', 'textAlign getter returns incorrect value');
-
-ctx.restore();
-is(ctx.textAlign, 'right', 'textAlign not being stored in the context state');
-
-ctx.restore();
-is(ctx.textAlign, 'center', 'textAlign not being stored in the context state');
-
-ctx.restore();
-is(ctx.textAlign, 'left', 'textAlign not being stored in the context state');
-
-ctx.restore();
-is(ctx.textAlign, 'end', 'textAlign not being stored in the context state');
-
-ctx.restore();
-is(ctx.textAlign, 'start', 'textAlign not being stored in the context state');
-
-if (!_deferred) SimpleTest.finish();
-});
-</script>
-
diff --git a/content/canvas/test/test_text.textBaseline.html b/content/canvas/test/test_text.textBaseline.html
deleted file mode 100644
index 770a94889848..000000000000
--- a/content/canvas/test/test_text.textBaseline.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: text.textBaseline</title>
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/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');
-
-is(ctx.textBaseline, 'alphabetic', "default textBaseline is not 'alphabetic'");
-
-ctx.save();
-ctx.textBaseline = 'ideographic';
-is(ctx.textBaseline, 'ideographic', 'textBaseline getter returns incorrect value');
-
-ctx.save();
-ctx.textBaseline = 'top';
-is(ctx.textBaseline, 'top', 'textBaseline getter returns incorrect value');
-
-ctx.save();
-ctx.textBaseline = 'middle';
-is(ctx.textBaseline, 'middle', 'textBaseline getter returns incorrect value');
-
-ctx.save();
-ctx.textBaseline = 'bottom';
-is(ctx.textBaseline, 'bottom', 'textBaseline getter returns incorrect value');
-
-ctx.save();
-ctx.textBaseline = 'hanging';
-is(ctx.textBaseline, 'hanging', 'textBaseline getter returns incorrect value');
-
-ctx.save();
-ctx.textBaseline = 'alphabetic';
-is(ctx.textBaseline, 'alphabetic', 'textBaseline getter returns incorrect value');
-
-ctx.restore();
-is(ctx.textBaseline, 'hanging', 'textBaseline not being stored in the context state');
-
-ctx.restore();
-is(ctx.textBaseline, 'bottom', 'textBaseline not being stored in the context state');
-
-ctx.restore();
-is(ctx.textBaseline, 'middle', 'textBaseline not being stored in the context state');
-
-ctx.restore();
-is(ctx.textBaseline, 'top', 'textBaseline not being stored in the context state');
-
-ctx.restore();
-is(ctx.textBaseline, 'ideographic', 'textBaseline not being stored in the context state');
-
-ctx.restore();
-is(ctx.textBaseline, 'alphabetic', 'textBaseline not being stored in the context state');
-
-if (!_deferred) SimpleTest.finish();
-});
-</script>
-
diff --git a/content/canvas/test/test_toDataURL.arguments.1.html b/content/canvas/test/test_toDataURL.arguments.1.html
deleted file mode 100644
index e40e974241e9..000000000000
--- a/content/canvas/test/test_toDataURL.arguments.1.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: toDataURL.arguments.1 - bug 401795</title>
-<!-- Testing: toDataURL ignores extra arguments -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-var data = canvas.toDataURL('image/png', 'another argument that should not raise an exception');
-ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_toDataURL.arguments.2.html b/content/canvas/test/test_toDataURL.arguments.2.html
deleted file mode 100644
index af110ba3d2d5..000000000000
--- a/content/canvas/test/test_toDataURL.arguments.2.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: toDataURL.arguments.2 - bug 401795</title>
-<!-- Testing: toDataURL ignores extra arguments -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-var data = canvas.toDataURL('image/png', 'another argument that should not raise an exception', 'and another');
-ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_toDataURL.arguments.3.html b/content/canvas/test/test_toDataURL.arguments.3.html
deleted file mode 100644
index cea223dabd56..000000000000
--- a/content/canvas/test/test_toDataURL.arguments.3.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: toDataURL.arguments.3 - bug 401795</title>
-<!-- Testing: toDataURL ignores extra arguments -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-// More arguments that should not raise exceptions
-var data = canvas.toDataURL('image/png', null, null, null);
-ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_toDataURL.complexcolours.html b/content/canvas/test/test_toDataURL.complexcolours.html
deleted file mode 100644
index 70104c541651..000000000000
--- a/content/canvas/test/test_toDataURL.complexcolours.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: toDataURL.complexcolours</title>
-<!-- Testing: toDataURL handles non-primary and non-solid colours correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function 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();
-
-
-});
-</script>
-
diff --git a/content/canvas/test/test_toDataURL.default.html b/content/canvas/test/test_toDataURL.default.html
deleted file mode 100644
index 408a2cd17ebb..000000000000
--- a/content/canvas/test/test_toDataURL.default.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: toDataURL.default</title>
-<!-- Testing: toDataURL with no arguments returns a PNG -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var data = canvas.toDataURL();
-ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_toDataURL.lowercase.html b/content/canvas/test/test_toDataURL.lowercase.html
deleted file mode 100644
index 9062af859f79..000000000000
--- a/content/canvas/test/test_toDataURL.lowercase.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: toDataURL.lowercase - bug 401795</title>
-<!-- Testing: toDataURL type is case-sensitive -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-var data = canvas.toDataURL('ImAgE/PnG');
-ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_toDataURL.nocontext.html b/content/canvas/test/test_toDataURL.nocontext.html
deleted file mode 100644
index c087fc157f07..000000000000
--- a/content/canvas/test/test_toDataURL.nocontext.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: toDataURL.nocontext</title>
-<!-- Testing: toDataURL works before any context has been got -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var canvas2 = document.createElement('canvas');
-var data = canvas2.toDataURL();
-ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_toDataURL.png.html b/content/canvas/test/test_toDataURL.png.html
deleted file mode 100644
index 92e58a39f42d..000000000000
--- a/content/canvas/test/test_toDataURL.png.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: toDataURL.png</title>
-<!-- Testing: toDataURL with image/png returns a PNG -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var data = canvas.toDataURL('image/png');
-ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_toDataURL.primarycolours.html b/content/canvas/test/test_toDataURL.primarycolours.html
deleted file mode 100644
index 5858c3002d6b..000000000000
--- a/content/canvas/test/test_toDataURL.primarycolours.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: toDataURL.primarycolours</title>
-<!-- Testing: toDataURL handles simple colours correctly -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function 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 data = canvas.toDataURL();
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-var img = new Image();
-deferTest();
-img.onload = wrapFunction(function ()
-{
-    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 = data;
-
-
-});
-</script>
-
diff --git a/content/canvas/test/test_toDataURL.unrecognised.html b/content/canvas/test/test_toDataURL.unrecognised.html
deleted file mode 100644
index 9c32c09cd036..000000000000
--- a/content/canvas/test/test_toDataURL.unrecognised.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: toDataURL.unrecognised - bug 401795</title>
-<!-- Testing: toDataURL with an unhandled type returns a PNG -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var _thrown_outer = false;
-try {
-
-var data = canvas.toDataURL('image/example');
-ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
-
-} catch (e) {
-    _thrown_outer = true;
-}
-todo(!_thrown_outer, 'should not throw exception');
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_toDataURL.zerosize.html b/content/canvas/test/test_toDataURL.zerosize.html
deleted file mode 100644
index fb3d261b4854..000000000000
--- a/content/canvas/test/test_toDataURL.zerosize.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: toDataURL.zerosize</title>
-<!-- Testing: toDataURL on zero-size canvas returns 'data:,' -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="0" height="0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-var data = canvas.toDataURL();
-todo(data === 'data:,', "data === 'data:,'");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_type.delete.html b/content/canvas/test/test_type.delete.html
deleted file mode 100644
index fbf63b83d171..000000000000
--- a/content/canvas/test/test_type.delete.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: type.delete</title>
-<!-- Testing: window.HTMLCanvasElement interface object is DontDelete -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-delete window.HTMLCanvasElement;
-ok(window.HTMLCanvasElement, "window.HTMLCanvasElement");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_type.exists.html b/content/canvas/test/test_type.exists.html
deleted file mode 100644
index 2b5e67115557..000000000000
--- a/content/canvas/test/test_type.exists.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: type.exists</title>
-<!-- Testing: HTMLCanvasElement is a property of window -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(window.HTMLCanvasElement, "window.HTMLCanvasElement");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_type.extend.html b/content/canvas/test/test_type.extend.html
deleted file mode 100644
index 14094076daae..000000000000
--- a/content/canvas/test/test_type.extend.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: type.extend</title>
-<!-- Testing: HTMLCanvasElement methods can be added, and the new methods used by canvases -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-window.HTMLCanvasElement.prototype.getZero = function () { return 0; };
-ok(canvas.getZero() === 0, "canvas.getZero() === 0");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_type.name.html b/content/canvas/test/test_type.name.html
deleted file mode 100644
index f6b22fee4978..000000000000
--- a/content/canvas/test/test_type.name.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: type.name</title>
-<!-- Testing: HTMLCanvasElement type and toString -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(Object.prototype.toString.call(canvas) === '[object HTMLCanvasElement]', "Object.prototype.toString.call(canvas) === '[object HTMLCanvasElement]'");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_type.prototype.html b/content/canvas/test/test_type.prototype.html
deleted file mode 100644
index bd0f9e281156..000000000000
--- a/content/canvas/test/test_type.prototype.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: type.prototype</title>
-<!-- Testing: window.HTMLCanvasElement has prototype, which is { ReadOnly, DontDelete }. prototype has getContext, which is not -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ok(window.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");
-
-SimpleTest.finish();
-
-});
-</script>
-
diff --git a/content/canvas/test/test_type.replace.html b/content/canvas/test/test_type.replace.html
deleted file mode 100644
index 9ce27c081e32..000000000000
--- a/content/canvas/test/test_type.replace.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: type.replace</title>
-<!-- Testing: HTMLCanvasElement methods can be replaced, and the replacement methods used by canvases -->
-<script src="/MochiKit/packed.js"></script>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-
-SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-window.HTMLCanvasElement.prototype.getContext = function (name) { return 0; };
-ok(canvas.getContext('2d') === 0, "canvas.getContext('2d') === 0");
-
-SimpleTest.finish();
-
-});
-</script>
-